Merge branch 'dev' into 399_remove_infinity_participants

hpi-swt2 · Feb 1, 2017 · 72d10c7 · 72d10c7
2 parents 4e273f1 + 1089272
commit 72d10c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/spec/factories/profiles.rb b/spec/factories/profiles.rb
@@ -10,7 +10,7 @@
 
 FactoryGirl.define do
   factory :profile do
-    sequence(:first_name) { |n| "Karl#{n}" }
+    sequence(:first_name) { "Karl#{rand(1..100)}" }
     sequence(:last_name) { |n| "Doe#{n}" }
     gender  "male"
     birth_date  15.years.ago

diff --git a/spec/features/event_spec.rb b/spec/features/event_spec.rb
@@ -330,13 +330,14 @@
       @users.each do |u|
         find(:css, "#selected_ids_[value='#{u.id}']").set(true) if u.id.even?
       end
+      select(I18n.t('events.badges.full_name'))
       click_button I18n.t('events.badges.print')
       strings = PDF::Inspector::Text.analyze(page.body).strings
       @users.each do |u|
         if u.id.even?
-          expect(strings).to include(u.profile.first_name)
+          expect(strings).to include(u.profile.name)
         else
-          expect(strings).not_to include(u.profile.first_name)
+          expect(strings).not_to include(u.profile.name)
         end
       end
     end