diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-01-01 00:04:07 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-13 19:34:58 +0300 |
commit | 8086b2bd2ecb0ff647da766c436eda47b7434599 (patch) | |
tree | 09d202981c18f3977b36c6af280d688b7a3aaadb | |
parent | 12903762d15cef256f579b1ddb692a0254cace52 (diff) |
Simplify BroadcastMessage factory
Also make the feature tests less brittle.
-rw-r--r-- | features/admin/broadcast_messages.feature | 2 | ||||
-rw-r--r-- | features/steps/admin/broadcast_messages.rb | 7 | ||||
-rw-r--r-- | spec/factories/broadcast_messages.rb | 13 |
3 files changed, 11 insertions, 11 deletions
diff --git a/features/admin/broadcast_messages.feature b/features/admin/broadcast_messages.feature index b2c3112320a..98d894a4fb6 100644 --- a/features/admin/broadcast_messages.feature +++ b/features/admin/broadcast_messages.feature @@ -6,7 +6,7 @@ Feature: Admin Broadcast Messages And I visit admin messages page Scenario: See broadcast messages list - Then I should be all broadcast messages + Then I should see all broadcast messages Scenario: Create a broadcast message When submit form with new broadcast message diff --git a/features/steps/admin/broadcast_messages.rb b/features/steps/admin/broadcast_messages.rb index f6daf852977..b59799c2f47 100644 --- a/features/steps/admin/broadcast_messages.rb +++ b/features/steps/admin/broadcast_messages.rb @@ -4,10 +4,10 @@ class Spinach::Features::AdminBroadcastMessages < Spinach::FeatureSteps include SharedAdmin step 'application already has admin messages' do - FactoryGirl.create(:broadcast_message, message: "Migration to new server") + FactoryGirl.create(:broadcast_message, :expired, message: "Migration to new server") end - step 'I should be all broadcast messages' do + step 'I should see all broadcast messages' do expect(page).to have_content "Migration to new server" end @@ -27,10 +27,9 @@ class Spinach::Features::AdminBroadcastMessages < Spinach::FeatureSteps step 'submit form with new customized broadcast message' do fill_in 'broadcast_message_message', with: 'Application update from 4:00 CST to 5:00 CST' - click_link "Customize colors" fill_in 'broadcast_message_color', with: '#f2dede' fill_in 'broadcast_message_font', with: '#b94a48' - select '2018', from: "broadcast_message_ends_at_1i" + select Date.today.next_year.year, from: "broadcast_message_ends_at_1i" click_button "Add broadcast message" end diff --git a/spec/factories/broadcast_messages.rb b/spec/factories/broadcast_messages.rb index ea0039d39e6..0c7bc573612 100644 --- a/spec/factories/broadcast_messages.rb +++ b/spec/factories/broadcast_messages.rb @@ -6,7 +6,6 @@ # message :text not null # starts_at :datetime # ends_at :datetime -# alert_type :integer # created_at :datetime # updated_at :datetime # color :string(255) @@ -18,10 +17,12 @@ FactoryGirl.define do factory :broadcast_message do message "MyText" - starts_at "2013-11-12 13:43:25" - ends_at "2013-11-12 13:43:25" - alert_type 1 - color "#555555" - font "#BBBBBB" + starts_at Date.today + ends_at Date.tomorrow + + trait :expired do + starts_at 5.days.ago + ends_at 3.days.ago + end end end |