From 4d5b885b7e1c44ff2f6e0237b87a638358cf9158 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 10 Jan 2017 20:13:48 +0100 Subject: [PATCH 1/2] sets spending proposal's settings to nil --- db/dev_seeds.rb | 4 ++-- db/seeds.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index b2e48a55f..73c20f0d2 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -25,8 +25,8 @@ Setting.create(key: 'url', value: 'http://localhost:3000') Setting.create(key: 'org_name', value: 'Consul') Setting.create(key: 'place_name', value: 'City') Setting.create(key: 'feature.debates', value: "true") -Setting.create(key: 'feature.spending_proposals', value: "true") -Setting.create(key: 'feature.spending_proposal_features.voting_allowed', value: "true") +Setting.create(key: 'feature.spending_proposals', value: nil) +Setting.create(key: 'feature.spending_proposal_features.voting_allowed', value: nil) Setting.create(key: 'feature.budgets', value: "true") Setting.create(key: 'feature.twitter_login', value: "true") Setting.create(key: 'feature.facebook_login', value: "true") diff --git a/db/seeds.rb b/db/seeds.rb index de8e7c69b..41261d9d7 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -63,7 +63,7 @@ Setting["meta_keywords"] = nil # Feature flags Setting['feature.debates'] = true -Setting['feature.spending_proposals'] = true +Setting['feature.spending_proposals'] = nil Setting['feature.twitter_login'] = true Setting['feature.facebook_login'] = true Setting['feature.google_login'] = true @@ -72,7 +72,7 @@ Setting['feature.budgets'] = true Setting['feature.signature_sheets'] = true # Spending proposals feature flags -Setting['feature.spending_proposal_features.voting_allowed'] = true +Setting['feature.spending_proposal_features.voting_allowed'] = nil # Banner styles Setting['banner-style.banner-style-one'] = "Banner style 1" From 53c5ea7e9093d9f04603cc0f221bc8563666267e Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 10 Jan 2017 21:30:38 +0100 Subject: [PATCH 2/2] fixes specs --- spec/features/admin/feature_flags_spec.rb | 2 ++ spec/features/admin/spending_proposals_spec.rb | 2 ++ spec/features/admin_spec.rb | 2 ++ spec/features/emails_spec.rb | 2 ++ spec/features/management/spending_proposals_spec.rb | 2 ++ spec/features/official_positions_spec.rb | 1 + spec/features/spending_proposals_spec.rb | 5 +++++ spec/features/valuation/spending_proposals_spec.rb | 2 ++ spec/features/valuation_spec.rb | 5 +++++ spec/features/votes_spec.rb | 6 +++++- spec/models/spending_proposal_spec.rb | 8 ++++++++ 11 files changed, 36 insertions(+), 1 deletion(-) diff --git a/spec/features/admin/feature_flags_spec.rb b/spec/features/admin/feature_flags_spec.rb index 4cb99a401..18b92eed5 100644 --- a/spec/features/admin/feature_flags_spec.rb +++ b/spec/features/admin/feature_flags_spec.rb @@ -3,6 +3,8 @@ require 'rails_helper' feature 'Admin feature flags' do background do + Setting["feature.spending_proposals"] = true + Setting['feature.spending_proposal_features.voting_allowed'] = true login_as(create(:administrator).user) end diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb index 73b157fd9..5539b5ead 100644 --- a/spec/features/admin/spending_proposals_spec.rb +++ b/spec/features/admin/spending_proposals_spec.rb @@ -3,6 +3,8 @@ require 'rails_helper' feature 'Admin spending proposals' do background do + Setting["feature.spending_proposals"] = true + Setting['feature.spending_proposal_features.voting_allowed'] = true admin = create(:administrator) login_as(admin.user) end diff --git a/spec/features/admin_spec.rb b/spec/features/admin_spec.rb index 9ef1b334e..161b01999 100644 --- a/spec/features/admin_spec.rb +++ b/spec/features/admin_spec.rb @@ -55,6 +55,8 @@ feature 'Admin' do end scenario "Admin access links" do + Setting["feature.spending_proposals"] = true + login_as(administrator) visit root_path diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index a9569e9b2..fe6c18774 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -123,6 +123,8 @@ feature 'Emails' do end scenario "Email on unfeasible spending proposal" do + Setting["feature.spending_proposals"] = true + spending_proposal = create(:spending_proposal) administrator = create(:administrator) valuator = create(:valuator) diff --git a/spec/features/management/spending_proposals_spec.rb b/spec/features/management/spending_proposals_spec.rb index 2c20ee684..2f1395a75 100644 --- a/spec/features/management/spending_proposals_spec.rb +++ b/spec/features/management/spending_proposals_spec.rb @@ -3,6 +3,8 @@ require 'rails_helper' feature 'Spending Proposals' do background do + Setting["feature.spending_proposals"] = true + Setting['feature.spending_proposal_features.voting_allowed'] = true login_as_manager end diff --git a/spec/features/official_positions_spec.rb b/spec/features/official_positions_spec.rb index 971a8fc6d..0bb2bdb12 100644 --- a/spec/features/official_positions_spec.rb +++ b/spec/features/official_positions_spec.rb @@ -73,6 +73,7 @@ feature 'Official positions' do context "Spending proposals" do background do + Setting["feature.spending_proposals"] = true @spending_proposal1 = create(:spending_proposal, author: @user1) @spending_proposal2 = create(:spending_proposal, author: @user2) end diff --git a/spec/features/spending_proposals_spec.rb b/spec/features/spending_proposals_spec.rb index 99dff84d8..7b3686a23 100644 --- a/spec/features/spending_proposals_spec.rb +++ b/spec/features/spending_proposals_spec.rb @@ -4,6 +4,11 @@ feature 'Spending proposals' do let(:author) { create(:user, :level_two, username: 'Isabel') } + background do + Setting["feature.spending_proposals"] = true + Setting['feature.spending_proposal_features.voting_allowed'] = true + end + scenario 'Index' do spending_proposals = [create(:spending_proposal), create(:spending_proposal), create(:spending_proposal, feasible: true)] unfeasible_spending_proposal = create(:spending_proposal, feasible: false) diff --git a/spec/features/valuation/spending_proposals_spec.rb b/spec/features/valuation/spending_proposals_spec.rb index c48b2bb60..25c5dfa61 100644 --- a/spec/features/valuation/spending_proposals_spec.rb +++ b/spec/features/valuation/spending_proposals_spec.rb @@ -3,6 +3,8 @@ require 'rails_helper' feature 'Valuation spending proposals' do background do + Setting["feature.spending_proposals"] = true + Setting['feature.spending_proposal_features.voting_allowed'] = true @valuator = create(:valuator, user: create(:user, username: 'Rachel', email: 'rachel@valuators.org')) login_as(@valuator.user) end diff --git a/spec/features/valuation_spec.rb b/spec/features/valuation_spec.rb index fab16027a..2dcdc91c1 100644 --- a/spec/features/valuation_spec.rb +++ b/spec/features/valuation_spec.rb @@ -3,6 +3,11 @@ require 'rails_helper' feature 'Valuation' do let(:user) { create(:user) } + background do + Setting["feature.spending_proposals"] = true + Setting['feature.spending_proposal_features.voting_allowed'] = true + end + scenario 'Access as regular user is not authorized' do login_as(user) visit root_path diff --git a/spec/features/votes_spec.rb b/spec/features/votes_spec.rb index 693f0fdba..162621b35 100644 --- a/spec/features/votes_spec.rb +++ b/spec/features/votes_spec.rb @@ -363,7 +363,11 @@ feature 'Votes' do end feature 'Spending Proposals' do - background { login_as(@manuela) } + background do + Setting["feature.spending_proposals"] = true + Setting['feature.spending_proposal_features.voting_allowed'] = true + login_as(@manuela) + end feature 'Index' do scenario "Index shows user votes on proposals" do diff --git a/spec/models/spending_proposal_spec.rb b/spec/models/spending_proposal_spec.rb index 78815a91e..889d9445b 100644 --- a/spec/models/spending_proposal_spec.rb +++ b/spec/models/spending_proposal_spec.rb @@ -290,6 +290,11 @@ describe SpendingProposal do let(:city_sp) { create(:spending_proposal) } let(:district_sp) { create(:spending_proposal, geozone: district) } + before(:each) do + Setting["feature.spending_proposals"] = true + Setting['feature.spending_proposal_features.voting_allowed'] = true + end + describe '#reason_for_not_being_votable_by' do it "rejects not logged in users" do expect(city_sp.reason_for_not_being_votable_by(nil)).to eq(:not_logged_in) @@ -344,6 +349,9 @@ describe SpendingProposal do describe "total votes" do it "takes into account physical votes in addition to web votes" do + Setting["feature.spending_proposals"] = true + Setting['feature.spending_proposal_features.voting_allowed'] = true + sp = create(:spending_proposal) sp.register_vote(create(:user, :level_two), true) expect(sp.total_votes).to eq(1)