From 0bd097c06df97b0b5ec0c7b8a265549881bdafcd Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 26 Apr 2016 12:59:50 +0200
Subject: [PATCH] Improved setup.

---
 test/fixtures/seeds.rb          |  7 +++++++
 test/integration/report_test.rb | 19 ++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/test/fixtures/seeds.rb b/test/fixtures/seeds.rb
index 72d568175..b9a8e5a51 100644
--- a/test/fixtures/seeds.rb
+++ b/test/fixtures/seeds.rb
@@ -2,9 +2,16 @@
 # inital data set as extention to db/seeds.rb
 
 # create email address and apply it to all groups
+channel_id = nil
+channel = Channel.find_by(area: 'Email::Notification', active: true)
+if channel
+  channel_id = channel
+end
+
 email_address = EmailAddress.create_if_not_exists(
   realname: 'Zammad',
   email: 'zammad@localhost',
+  channel_id: channel_id,
   updated_by_id: 1,
   created_by_id: 1
 )
diff --git a/test/integration/report_test.rb b/test/integration/report_test.rb
index ecc0cf9f2..6b3327f6b 100644
--- a/test/integration/report_test.rb
+++ b/test/integration/report_test.rb
@@ -35,7 +35,8 @@ class ReportTest < ActiveSupport::TestCase
   #Rake::Task["searchindex:create"].execute
   system('rake searchindex:rebuild')
 
-  Group.create_if_not_exists(
+  group1 = Group.lookup(name: 'Users')
+  group2 = Group.create_if_not_exists(
     name: 'Report Test',
     updated_by_id: 1,
     created_by_id: 1
@@ -45,7 +46,7 @@ class ReportTest < ActiveSupport::TestCase
 
   ticket1 = Ticket.create(
     title: 'test 1',
-    group: Group.lookup(name: 'Report Test'),
+    group: group2,
     customer_id: 2,
     state: Ticket::State.lookup(name: 'new'),
     priority: Ticket::Priority.lookup(name: '2 normal'),
@@ -76,7 +77,7 @@ class ReportTest < ActiveSupport::TestCase
 
   ticket2 = Ticket.create(
     title: 'test 2',
-    group: Group.lookup(name: 'Users'),
+    group: group1.id,
     customer_id: 2,
     state: Ticket::State.lookup(name: 'new'),
     priority: Ticket::Priority.lookup(name: '2 normal'),
@@ -101,13 +102,13 @@ class ReportTest < ActiveSupport::TestCase
     created_by_id: 1,
   )
   ticket2.update_attributes(
-    group_id: Group.lookup(name: 'Report Test').id,
+    group_id: group2.id,
     updated_at: '2015-10-28 14:30:00 UTC',
   )
 
   ticket3 = Ticket.create(
     title: 'test 3',
-    group: Group.lookup(name: 'Users'),
+    group: group1,
     customer_id: 2,
     state: Ticket::State.lookup(name: 'open'),
     priority: Ticket::Priority.lookup(name: '3 high'),
@@ -134,7 +135,7 @@ class ReportTest < ActiveSupport::TestCase
 
   ticket4 = Ticket.create(
     title: 'test 4',
-    group: Group.lookup(name: 'Users'),
+    group: group1,
     customer_id: 2,
     state: Ticket::State.lookup(name: 'closed'),
     priority: Ticket::Priority.lookup(name: '2 normal'),
@@ -162,7 +163,7 @@ class ReportTest < ActiveSupport::TestCase
 
   ticket5 = Ticket.create(
     title: 'test 5',
-    group: Group.lookup(name: 'Users'),
+    group: group1,
     customer_id: 2,
     state: Ticket::State.lookup(name: 'closed'),
     priority: Ticket::Priority.lookup(name: '3 high'),
@@ -194,7 +195,7 @@ class ReportTest < ActiveSupport::TestCase
 
   ticket6 = Ticket.create(
     title: 'test 6',
-    group: Group.lookup(name: 'Users'),
+    group: group1,
     customer_id: 2,
     state: Ticket::State.lookup(name: 'closed'),
     priority: Ticket::Priority.lookup(name: '2 normal'),
@@ -222,7 +223,7 @@ class ReportTest < ActiveSupport::TestCase
 
   ticket7 = Ticket.create(
     title: 'test 7',
-    group: Group.lookup(name: 'Users'),
+    group: group1,
     customer_id: 2,
     state: Ticket::State.lookup(name: 'closed'),
     priority: Ticket::Priority.lookup(name: '2 normal'),