From 1e1028dcb49e49bdae8f7df1823e1526846b0896 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Wed, 13 Dec 2017 19:46:07 -0400 Subject: [PATCH] Adapt existing milestone-related specs to fit the new requirement --- spec/factories.rb | 1 + spec/features/admin/budget_investment_milestones_spec.rb | 7 ++++++- spec/features/budgets/investments_spec.rb | 5 ++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/spec/factories.rb b/spec/factories.rb index 42bc57fd5..f7b68dd3c 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -362,6 +362,7 @@ FactoryGirl.define do association :investment, factory: :budget_investment sequence(:title) { |n| "Budget investment milestone #{n} title" } description 'Milestone description' + publication_date Time.zone.today end factory :vote do diff --git a/spec/features/admin/budget_investment_milestones_spec.rb b/spec/features/admin/budget_investment_milestones_spec.rb index 7f9e3ff63..c7dde7371 100644 --- a/spec/features/admin/budget_investment_milestones_spec.rb +++ b/spec/features/admin/budget_investment_milestones_spec.rb @@ -18,6 +18,7 @@ feature 'Admin budget investment milestones' do expect(page).to have_content("Milestone") expect(page).to have_content(milestone.title) expect(page).to have_content(milestone.id) + expect(page).to have_content(milestone.publication_date.to_date) end scenario 'Displaying no_milestones text' do @@ -36,11 +37,13 @@ feature 'Admin budget investment milestones' do fill_in 'budget_investment_milestone_title', with: 'New title milestone' fill_in 'budget_investment_milestone_description', with: 'New description milestone' + fill_in 'budget_investment_milestone_publication_date', with: Time.zone.today.to_date click_button 'Create milestone' expect(page).to have_content 'New title milestone' expect(page).to have_content 'New description milestone' + expect(page).to have_content Time.zone.today.to_date end scenario "Show validation errors on milestone form" do @@ -53,7 +56,7 @@ feature 'Admin budget investment milestones' do click_button 'Create milestone' within "#new_budget_investment_milestone" do - expect(page).to have_content "can't be blank" + expect(page).to have_content "can't be blank", count: 2 expect(page).to have_content 'New description milestone' end end @@ -72,11 +75,13 @@ feature 'Admin budget investment milestones' do fill_in 'budget_investment_milestone_title', with: 'Changed title' fill_in 'budget_investment_milestone_description', with: 'Changed description' + fill_in 'budget_investment_milestone_publication_date', with: Time.zone.today.to_date click_button 'Update milestone' expect(page).to have_content 'Changed title' expect(page).to have_content 'Changed description' + expect(page).to have_content Time.zone.today.to_date expect(page).to have_link 'Show image' end end diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 9cb1326b1..3e3aadf4d 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -493,8 +493,7 @@ feature 'Budget Investments' do scenario "Show milestones", :js do user = create(:user) investment = create(:budget_investment) - milestone = create(:budget_investment_milestone, investment: investment, title: "New text to show", - created_at: DateTime.new(2015, 9, 19).utc) + milestone = create(:budget_investment_milestone, investment: investment, title: "New text to show") image = create(:image, imageable: milestone) login_as(user) @@ -505,7 +504,7 @@ feature 'Budget Investments' do within("#tab-milestones") do expect(page).to have_content(milestone.title) expect(page).to have_content(milestone.description) - expect(page).to have_content("Published 2015-09-19") + expect(page).to have_content(Time.zone.today.to_date) expect(page.find("#image_#{milestone.id}")['alt']).to have_content image.title end end