Fixed bug with multiple profile def.

hpi-swt2 · Feb 5, 2017 · 5480805 · 5480805
1 parent 702680a
commit 5480805
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/spec/factories/events.rb b/spec/factories/events.rb
@@ -232,11 +232,6 @@
         create_list(:application_letter_pending, evaluator.pending_application_letters_count, event: event)
       end
 
-      trait :applications_with_profile do
-        after(:create) do |event|
-          event.application_letters.each {|application| application.user.profile = FactoryGirl.create(:profile) }
-        end        
-      end 
     end
 
     factory :event_in_execution_with_applications_in_various_states do
@@ -283,11 +278,6 @@
          end
       end
 
-      trait :applications_with_profile do
-        after(:create) do |event|
-          event.application_letters.each {|application| application.user.profile = FactoryGirl.create(:profile) }
-        end        
-      end  
     end
   end
 end
diff --git a/spec/features/events_spec.rb b/spec/features/events_spec.rb
@@ -169,7 +169,7 @@
 
   scenario "logged in as Organizer I can cancel accepted applications (execution phase)" do
     login(:organizer)
-    @event = FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :with_status_notification_sent, :applications_with_profile, accepted_application_letters_count: 1)
+    @event = FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :with_status_notification_sent, accepted_application_letters_count: 1)
     @application_letter = @event.application_letters.find { |application| application.status == 'accepted'}
     visit event_path(@event)
     expect(page).to have_link(I18n.t "application_status.actions.cancel")
@@ -184,7 +184,7 @@
 
   scenario "logged in as Organizer I can accept alternative applications (execution phase)" do
     login(:organizer)
-    @event = FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :with_status_notification_sent, :applications_with_profile, alternative_application_letters_count: 1)
+    @event = FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :with_status_notification_sent, alternative_application_letters_count: 1)
     @application_letter = @event.application_letters.find { |application| application.status == 'alternative'}
     visit event_path(@event)
     expect(page).to have_link(I18n.t "application_status.actions.accept")
@@ -199,7 +199,7 @@
 
   scenario "logged in as Organizer I cannot accept alternative applications if no free places are available (execution phase)" do
     login(:organizer)
-    @event = FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :applications_with_profile, accepted_application_letters_count: 2, alternative_application_letters_count: 1, max_participants: 2)
+    @event = FactoryGirl.create(:event_in_execution_with_applications_in_various_states, accepted_application_letters_count: 2, alternative_application_letters_count: 1, max_participants: 2)
     @application_letter = @event.application_letters.find { |application| application.status == 'alternative'}
     @application_letter.status_notification_sent = true
     @application_letter.save! 

diff --git a/spec/views/events/show.html.erb_spec.rb b/spec/views/events/show.html.erb_spec.rb
@@ -297,7 +297,7 @@
   end
 
   it "renders a cancel button but no envelope glypicon for accepted applications with status notification sent in execution phase" do
-    @event = assign(:event, FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :with_status_notification_sent, :applications_with_profile, accepted_application_letters_count: 1))
+    @event = assign(:event, FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :with_status_notification_sent, accepted_application_letters_count: 1))
     @application_letters = @event.application_letters
     @application_letter = @event.application_letters.find{|l| l.status == 'accepted'}
     assign(:has_free_places, @event.compute_free_places > 0)
@@ -308,7 +308,7 @@
   end
 
   it "renders an envelope glyphicon but no cancel button in execution phase for each accepted application with status notification sent flag not set" do
-    @event = assign(:event, FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :with_no_status_notification_sent, :applications_with_profile, accepted_application_letters_count: 1))
+    @event = assign(:event, FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :with_no_status_notification_sent, accepted_application_letters_count: 1))
     @application_letters = @event.application_letters
     @application_letter = @event.application_letters.find{|l| l.status == 'accepted'}
     assign(:has_free_places, @event.compute_free_places > 0)
@@ -319,7 +319,7 @@
   end
 
   it "renders an accept button for alternative applications in execution phase" do
-    @event = assign(:event, FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :applications_with_profile, alternative_application_letters_count: 1))
+    @event = assign(:event, FactoryGirl.create(:event_in_execution_with_applications_in_various_states, alternative_application_letters_count: 1))
     @application_letters = @event.application_letters
     @application_letter = @event.application_letters.find{|l| l.status == 'alternative'}
     assign(:has_free_places, @event.compute_free_places > 0)
@@ -329,7 +329,7 @@
   end
 
   it "doesnt render an accept button for alternative applications in execution phase when there are not enough free places" do
-    @event = assign(:event, FactoryGirl.create(:event_in_execution_with_applications_in_various_states, :applications_with_profile, alternative_application_letters_count: 1))
+    @event = assign(:event, FactoryGirl.create(:event_in_execution_with_applications_in_various_states, alternative_application_letters_count: 1))
     @application_letters = @event.application_letters
     @application_letter = @event.application_letters.find{|l| l.status == 'alternative'}
     assign(:has_free_places, false)