Merge pull request #356 from hitobito/bug/fix-ci-fails

feature/fix-ci-fails

Author: Vakmeth

spec/controllers/events_controller_spec.rb

@@ -215,7 +215,7 @@ def fill_in_required_columns(event)
 
       context 'as co-leader' do
         before do
-          Fabricate(Event::Camp::Role::AssistantLeader.name.to_sym, person: person, event: event)
+          Fabricate(Event::Camp::Role::AssistantLeader.name.to_sym, person: Fabricate(:person), event: event)
           event.update!(coach_id: people(:al_berchtold).id, leader_id: people(:al_schekka).id)
         end
 

spec/mailers/event/camp_mailer_spec.rb

@@ -155,7 +155,7 @@
         subject { mail }
         its(:subject) { should eq 'Einreichung Lager' }
         its(:to)      { should eq ['lager@pbs.ch'] }
-        its(:cc)      { should eq [coach.email, abteilungsleitung.email, leader.email] }
+        its(:cc)      { should match_array [coach.email, abteilungsleitung.email, leader.email] }
         its(:from)    { should eq ['noreply@localhost'] }
       end
 
@@ -164,7 +164,7 @@
         subject { mail }
         its(:subject) { should eq 'Einreichung Lager' }
         its(:to)      { should eq ['lager@pbs.ch', 'auslandlager@pbs.ch'] }
-        its(:cc)      { should eq [coach.email, abteilungsleitung.email, leader.email] }
+        its(:cc)      { should match_array [coach.email, abteilungsleitung.email, leader.email] }
         its(:from)    { should eq ['noreply@localhost'] }
       end
     end

spec/regressions/events_controller_camp_spec.rb

@@ -169,7 +169,7 @@ def assert_advisor(advisor_key, text, warning)
             context key do
               it 'is marked as unassigned if advisor not set' do
                 camp.participations.destroy_all
-                assert_advisor(key, 'Niemand zugeordnet', true)
+                assert_advisor(key, 'Niemand zugeordnetKeine Leitenden erfasst', true)
               end
 
               it 'is marked as assigned if advisor set' do