Commit 8086b2bd authored by Robert Speicher's avatar Robert Speicher

Simplify BroadcastMessage factory

Also make the feature tests less brittle.
parent 12903762
......@@ -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
......@@ -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")
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"
......@@ -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, from: "broadcast_message_ends_at_1i"
click_button "Add broadcast message"
......@@ -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"
ends_at Date.tomorrow
trait :expired do
starts_at 5.days.ago
ends_at 3.days.ago
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment