From e0abb862673a1605618cc46d78cea2c72465137c Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 22 Jan 2018 19:48:13 +0100 Subject: [PATCH] Update specs for new heading options naming rules * Update budget heading order scenario to check new option name rules * Update other scenarios that were expecting old heading naming convention --- .../features/admin/budget_investments_spec.rb | 2 +- spec/features/budgets/investments_spec.rb | 22 ++++++- spec/features/emails_spec.rb | 2 +- .../management/budget_investments_spec.rb | 2 +- spec/features/tags/budget_investments_spec.rb | 58 +++++++++++++++++-- 5 files changed, 76 insertions(+), 10 deletions(-) diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index 05e3f905d..980f19283 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -101,7 +101,7 @@ feature 'Admin budget investments' do expect(page).to have_link("Change name") expect(page).to have_link("Plant trees") - select "Parks: Central Park", from: "heading_id" + select "Central Park", from: "heading_id" expect(page).not_to have_link("Realocate visitors") expect(page).not_to have_link("Change name") diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 9bd9ae458..af27facb3 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -609,7 +609,7 @@ feature 'Budget Investments' do login_as(author) visit new_budget_investment_path(budget_id: budget.id) - select 'Health: More hospitals', from: 'budget_investment_heading_id' + select heading.name, from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'I am a bot' fill_in 'budget_investment_subtitle', with: 'This is the honeypot' fill_in 'budget_investment_description', with: 'This is the description' @@ -628,7 +628,7 @@ feature 'Budget Investments' do login_as(author) visit new_budget_investment_path(budget_id: budget.id) - select 'Health: More hospitals', from: 'budget_investment_heading_id' + select heading.name, from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'I am a bot' fill_in 'budget_investment_description', with: 'This is the description' check 'budget_investment_terms_of_service' @@ -644,7 +644,7 @@ feature 'Budget Investments' do visit new_budget_investment_path(budget_id: budget.id) - select 'Health: More hospitals', from: 'budget_investment_heading_id' + select heading.name, from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a skyscraper' fill_in 'budget_investment_description', with: 'I want to live in a high tower over the clouds' fill_in 'budget_investment_location', with: 'City center' @@ -735,6 +735,22 @@ feature 'Budget Investments' do expect(page).not_to have_content('My ballot') end end + + scenario "Heading options are correctly ordered" do + city_group = create(:budget_group, name: "Toda la ciudad", budget: budget) + create(:budget_heading, name: "Toda la ciudad", price: 333333, group: city_group) + create(:budget_heading, name: "More health professionals", price: 999999, group: group) + + login_as(author) + + visit new_budget_investment_path(budget_id: budget.id) + + select_options = find('#budget_investment_heading_id').all('option').collect(&:text) + expect(select_options.first).to eq('') + expect(select_options.second).to eq('Health: More health professionals') + expect(select_options.third).to eq('Health: More hospitals') + expect(select_options.fourth).to eq('Toda la ciudad') + end end scenario "Show" do diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 16be1cbf4..02892ef18 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -366,7 +366,7 @@ feature 'Emails' do login_as(author) visit new_budget_investment_path(budget_id: budget.id) - select "#{group.name}: #{heading.name}", from: 'budget_investment_heading_id' + select heading.name, from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a hospital' fill_in 'budget_investment_description', with: 'We have lots of people that require medical attention' check 'budget_investment_terms_of_service' diff --git a/spec/features/management/budget_investments_spec.rb b/spec/features/management/budget_investments_spec.rb index 6132c40cd..26df620e5 100644 --- a/spec/features/management/budget_investments_spec.rb +++ b/spec/features/management/budget_investments_spec.rb @@ -29,7 +29,7 @@ feature 'Budget Investments' do expect(page).to have_content user.document_number end - select "Whole city: Health", from: 'budget_investment_heading_id' + select "Health", from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a park in my neighborhood' fill_in 'budget_investment_description', with: 'There is no parks here...' fill_in 'budget_investment_location', with: 'City center' diff --git a/spec/features/tags/budget_investments_spec.rb b/spec/features/tags/budget_investments_spec.rb index 04fb05ddb..9afbdf7a8 100644 --- a/spec/features/tags/budget_investments_spec.rb +++ b/spec/features/tags/budget_investments_spec.rb @@ -65,7 +65,7 @@ feature 'Tags' do visit new_budget_investment_path(budget_id: budget.id) - select "#{group.name}: #{heading.name}", from: 'budget_investment_heading_id' + select heading.name, from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a skyscraper' fill_in 'budget_investment_description', with: 'I want to live in a high tower over the clouds' check 'budget_investment_terms_of_service' @@ -84,7 +84,7 @@ feature 'Tags' do visit new_budget_investment_path(budget_id: budget.id) - select "#{group.name}: #{heading.name}", from: 'budget_investment_heading_id' + select heading.name, from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a skyscraper' fill_in_ckeditor 'budget_investment_description', with: 'If I had a gym near my place I could go do Zumba' check 'budget_investment_terms_of_service' @@ -100,12 +100,62 @@ feature 'Tags' do end end + scenario "Turbolinks sanity check from budget's show", :js do + login_as(author) + + education = create(:tag, name: 'Education', kind: 'category') + health = create(:tag, name: 'Health', kind: 'category') + + visit budget_path(budget) + click_link "Create a budget investment" + + select heading.name, from: 'budget_investment_heading_id' + fill_in 'budget_investment_title', with: 'Build a skyscraper' + fill_in_ckeditor 'budget_investment_description', with: 'If I had a gym near my place I could go do Zumba' + check 'budget_investment_terms_of_service' + + find('.js-add-tag-link', text: 'Education').click + click_button 'Create Investment' + + expect(page).to have_content 'Investment created successfully.' + + within "#tags_budget_investment_#{Budget::Investment.last.id}" do + expect(page).to have_content 'Education' + expect(page).not_to have_content 'Health' + end + end + + scenario "Turbolinks sanity check from budget heading's show", :js do + login_as(author) + + education = create(:tag, name: 'Education', kind: 'category') + health = create(:tag, name: 'Health', kind: 'category') + + visit budget_investments_path(budget, heading_id: heading.id) + click_link "Create a budget investment" + + select heading.name, from: 'budget_investment_heading_id' + fill_in 'budget_investment_title', with: 'Build a skyscraper' + fill_in_ckeditor 'budget_investment_description', with: 'If I had a gym near my place I could go do Zumba' + check 'budget_investment_terms_of_service' + + find('.js-add-tag-link', text: 'Education').click + click_button 'Create Investment' + + expect(page).to have_content 'Investment created successfully.' + + within "#tags_budget_investment_#{Budget::Investment.last.id}" do + expect(page).to have_content 'Education' + expect(page).not_to have_content 'Health' + end + end + scenario 'Create with too many tags' do login_as(author) visit new_budget_investment_path(budget_id: budget.id) - select "#{group.name}: #{heading.name}", from: 'budget_investment_heading_id' + select heading.name, from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a skyscraper' fill_in 'budget_investment_description', with: 'I want to live in a high tower over the clouds' check 'budget_investment_terms_of_service' @@ -123,7 +173,7 @@ feature 'Tags' do visit new_budget_investment_path(budget_id: budget.id) - select "#{group.name}: #{heading.name}", from: 'budget_investment_heading_id' + select heading.name, from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a skyscraper' fill_in 'budget_investment_description', with: 'I want to live in a high tower over the clouds' check 'budget_investment_terms_of_service'