decidim 0.0.1 → 0.0.2

data/decidim-proposals/lib/decidim/proposals/feature.rb

@@ -5,13 +5,18 @@ require_dependency "decidim/features/namer"
 Decidim.register_feature(:proposals) do |feature|
   feature.engine = Decidim::Proposals::Engine
   feature.admin_engine = Decidim::Proposals::AdminEngine
+  feature.icon = "decidim/proposals/icon.svg"
 
-  feature.on(:destroy) do |instance|
+  feature.on(:before_destroy) do |instance|
     if Decidim::Proposals::Proposal.where(feature: instance).any?
       raise "Can't destroy this feature when there are proposals"
     end
   end
 
+  feature.settings(:step) do |settings|
+    settings.attribute :votes_enabled, type: :boolean
+  end
+
   feature.seeds do
     Decidim::ParticipatoryProcess.all.each do |process|
       next unless process.steps.any?
@@ -19,16 +24,37 @@ Decidim.register_feature(:proposals) do |feature|
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
         manifest_name: :proposals,
-        participatory_process: process
+        participatory_process: process,
+        step_settings: {
+          process.active_step.id => { votes_enabled: true }
+        }
       )
 
-      20.times do
-        Decidim::Proposals::Proposal.create!(
+      20.times do |n|
+        proposal = Decidim::Proposals::Proposal.create!(
           feature: feature,
           title: Faker::Lorem.sentence(2),
           body: Faker::Lorem.paragraphs(2).join("\n"),
           author: Decidim::User.where(organization: feature.organization).all.sample
         )
+
+        rand(3).times do |m|
+          email = "vote-author-#{process.id}-#{n}-#{m}@decidim.org"
+          name = "#{Faker::Name.name} #{process.id} #{n} #{m}"
+
+          author = Decidim::User.create!(email: email,
+                                         password: "password1234",
+                                         password_confirmation: "password1234",
+                                         name: name,
+                                         organization: feature.organization,
+                                         tos_agreement: "1",
+                                         confirmed_at: Time.now)
+
+          Decidim::Proposals::ProposalVote.create!(proposal: proposal,
+                                                   author: author)
+        end
+
+        Decidim::Comments::Seed.comments_for(proposal)
       end
     end
   end

data/decidim-proposals/spec/commands/decidim/proposals/create_proposal_spec.rb

@@ -12,18 +12,25 @@ module Decidim
           {
             title: "Proposal title",
             body: "Proposal body",
-            author: create(:user, organization: organization),
             feature: feature
           }
         end
+
+        let(:author) do
+          create(:user, organization: organization)
+        end
+
         let(:form) do
           ProposalForm.from_params(
-            form_params,
+            form_params
+          ).with_context(
             current_organization: organization,
+            current_feature: feature,
             current_process: participatory_process
           )
         end
-        let(:command) { described_class.new(form) }
+
+        let(:command) { described_class.new(form, author) }
 
         describe "when the form is not valid" do
           before do

data/decidim-proposals/spec/factories.rb

@@ -1,10 +1,10 @@
-require_relative "../../decidim-core/spec/factories"
-require_relative "../../decidim-admin/spec/factories"
-require_relative "../../decidim-comments/spec/factories"
+require "decidim/core/test/factories"
+require "decidim/admin/test/factories"
+require "decidim/comments/test/factories"
 
 FactoryGirl.define do
   factory :proposal_feature, class: Decidim::Feature do
-    name { Decidim::Features::Namer.new(I18n.locales, :proposals).i18n_name }
+    name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :proposals).i18n_name }
     manifest_name :proposals
     participatory_process
   end
@@ -15,4 +15,9 @@ FactoryGirl.define do
     feature
     author { create(:user, organization: feature.organization) }
   end
+
+  factory :proposal_vote, class: Decidim::Proposals::ProposalVote do
+    proposal { build(:proposal) }
+    author { build(:user, organization: proposal.organization) }
+  end
 end

data/decidim-proposals/spec/features/admin_manages_proposals_spec.rb

@@ -7,6 +7,8 @@ require_relative "../shared/manage_proposals_examples"
 describe "Admin manages proposals", type: :feature do
   include_context "admin"
   it_behaves_like "manage proposals"
+  include_context "feature"
+  let(:manifest_name) { "proposals" }
 
   before do
     switch_to_host(organization.host)

data/decidim-proposals/spec/features/process_admin_manages_proposals_spec.rb

@@ -8,6 +8,8 @@ describe "Process admin manages proposals", type: :feature do
   include_context "admin"
   let(:user) { process_admin }
   it_behaves_like "manage proposals"
+  include_context "feature"
+  let(:manifest_name) { "proposals" }
 
   before do
     switch_to_host(organization.host)

data/decidim-proposals/spec/features/proposals_spec.rb

@@ -2,36 +2,33 @@
 require "spec_helper"
 
 describe "Proposals", type: :feature do
-  let(:feature) { create(:proposal_feature) }
-  let(:organization) { feature.organization }
-  let(:participatory_process) { feature.participatory_process }
+  include_context "feature"
+  let(:manifest_name) { "proposals" }
+
   let!(:proposals) { create_list(:proposal, 3, feature: feature) }
   let!(:category) { create :category, participatory_process: participatory_process }
   let!(:scope) { create :scope, organization: organization }
   let!(:user) { create :user, :confirmed, organization: organization }
 
   before do
-    switch_to_host(organization.host)
-    visit decidim.root_path
+    visit_feature
   end
 
   context "creating a new proposal" do
     context "when the user is logged in" do
       before do
         login_as user, scope: :user
+        visit_feature      
       end
 
       it "creates a new proposal" do
-        click_link "Processes"
-        click_link participatory_process.title["en"]
-        click_link "Proposals"
         click_link "New proposal"
 
         within ".new_proposal" do
           fill_in :proposal_title, with: "Oriol for president"
           fill_in :proposal_body, with: "He will solve everything"
           select category.name["en"], from: :proposal_category_id
-          select scope.name["en"], from: :proposal_scope_id
+          select scope.name, from: :proposal_scope_id
 
           find("*[type=submit]").click
         end
@@ -40,7 +37,7 @@ describe "Proposals", type: :feature do
         expect(page).to have_content("Oriol for president")
         expect(page).to have_content("He will solve everything")
         expect(page).to have_content(category.name["en"])
-        expect(page).to have_content(scope.name["en"])
+        expect(page).to have_content(scope.name)
       end
     end
   end
@@ -49,11 +46,8 @@ describe "Proposals", type: :feature do
     let!(:official_proposal) { create(:proposal, feature: feature, author: nil) }
 
     it "shows the author as official" do
-      click_link "Processes"
-      click_link participatory_process.title["en"]
-      click_link "Proposals"
+      visit_feature
       click_link official_proposal.title
-
       expect(page).to have_content("Official proposal")
     end
   end
@@ -63,13 +57,8 @@ describe "Proposals", type: :feature do
     let(:author) { create(:user, :confirmed, organization: feature.organization)}
     let!(:comments) { create_list(:comment, 3, commentable: proposal) }
 
-    before do
-      click_link "Processes"
-      click_link participatory_process.title["en"]
-      click_link "Proposals"
-    end
-
     it "shows the comments" do
+      visit_feature
       click_link proposal.title
 
       comments.each do |comment| 
@@ -79,14 +68,8 @@ describe "Proposals", type: :feature do
   end
 
   context "listing proposals in a participatory process" do
-    before do
-      click_link "Processes"
-      click_link participatory_process.title["en"]
-      click_link "Proposals"
-    end
-
     it "lists all the proposals" do
-      expect(page).to have_css(".card--proposal", 3)
+      expect(page).to have_css(".card--proposal", count: 3)
     end
 
     it "allows viewing a single proposal" do
@@ -101,16 +84,43 @@ describe "Proposals", type: :feature do
 
     context "when there are a lot of proposals" do
       before do
-        create_list(:proposal, 20, feature: feature)
-        visit current_path
+        create_list(:proposal, 17, feature: feature)
+        visit_feature
       end
 
       it "paginates them" do
-        expect(page).to have_css(".card--proposal", 12)
+        expect(page).to have_css(".card--proposal", count: 12)
 
         find(".pagination-next a").click
 
-        expect(page).to have_css(".card--proposal", 8)
+        expect(page).to have_css(".card--proposal", count: 8)
+      end
+    end
+
+    context "when filtering" do
+      context "by origin 'official'" do
+        it "lists the filtered proposals" do
+          create(:proposal, feature: feature, scope: scope, decidim_author_id: nil)
+          visit_feature
+
+          within ".filters" do
+            choose "Official"
+          end
+
+          expect(page).to have_css(".card--proposal", count: 1)
+          expect(page).to have_content("1 PROPOSAL")
+        end
+      end
+
+      context "by origin 'citizenship'" do
+        it "lists the filtered proposals" do
+          within ".filters" do
+            choose "Citizenship"
+          end
+
+          expect(page).to have_css(".card--proposal", count: proposals.size)
+          expect(page).to have_content("#{proposals.size} PROPOSALS")
+        end
       end
     end
   end

data/decidim-proposals/spec/features/vote_proposal_spec.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe "Vote Proposal", type: :feature do
+  include_context "feature"
+  let(:manifest_name) { "proposals" }
+
+  let!(:proposals) { create_list(:proposal, 3, feature: feature) }
+  let!(:proposal) { Decidim::Proposals::Proposal.where(feature: feature).first }
+  let!(:user) { create :user, :confirmed, organization: organization }
+
+  let(:votes_enabled) { false }
+
+  before do
+    feature.step_settings = { participatory_process.active_step.id => { votes_enabled: votes_enabled } }
+    feature.save
+    visit_feature      
+  end
+
+  context "when votes are not enabled" do
+    it "doesn't show the vote proposal button and counts" do
+      expect(page).not_to have_css('.card__button', text: "Vote")
+      expect(page).not_to have_css('.card__support__data span', text: "0 VOTES")
+    end
+  end
+
+  context "when votes are enabled" do
+    let(:votes_enabled) { true }   
+      
+    context "when the user is not logged in" do
+      it "should be given the option to sign in" do
+        within ".card__support", match: :first do
+          page.find('.card__button').click
+        end
+
+        expect(page).to have_css('#loginModal', visible: true)
+      end
+    end
+
+    context "when the user is logged in" do
+      before do
+        login_as user, scope: :user
+        visit_feature
+      end
+
+      context "when the proposal is not voted yet" do
+        it "should be able to vote the proposal" do
+          within "#proposal-#{proposal.id}-vote-button" do
+            page.find('.card__button').click
+            expect(page).to have_css('.card__button.success', text: "Already voted")
+          end
+
+          within "#proposal-#{proposal.id}-votes-count" do
+            expect(page).to have_content("1 VOTE")
+          end
+        end
+      end
+
+      context "when the proposal is already voted" do
+        before do
+          create(:proposal_vote, proposal: proposal, author: user) 
+          visit_feature
+        end
+
+        it "should not be able to vote it again" do
+          within "#proposal-#{proposal.id}-vote-button" do
+            expect(page).to have_css('.card__button.success', text: "Already voted")
+            page.find('.card__button').click
+          end
+
+          within "#proposal-#{proposal.id}-votes-count" do
+            expect(page).to have_content("1 VOTE")          
+          end
+        end
+      end
+    end
+  end
+end

data/decidim-proposals/spec/forms/decidim/proposals/proposal_form_spec.rb

@@ -18,12 +18,18 @@ module Decidim
           body: body,
           author: author,
           category_id: category_id,
-          scope_id: scope_id,
-          feature: feature
+          scope_id: scope_id
         }
       end
 
-      subject { described_class.from_params(params) }
+      let(:form) do
+        described_class.from_params(params).with_context(
+          current_feature: feature,
+          current_organization: feature.organization
+        )
+      end
+
+      subject { form }
 
       context "when everything is OK" do
         it { is_expected.to be_valid }
@@ -39,11 +45,6 @@ module Decidim
         it { is_expected.to be_invalid }
       end
 
-      context "when there's no author" do
-        let(:author) { nil }
-        it { is_expected.to be_invalid }
-      end
-
       context "when no category_id" do
         let(:category_id) { nil }
         it { is_expected.to be_valid }
@@ -65,7 +66,7 @@ module Decidim
       end
 
       describe "category" do
-        subject { described_class.from_params(params).category }
+        subject { form.category }
 
         context "when the category exists" do
           it { is_expected.to be_kind_of(Decidim::Category) }
@@ -83,7 +84,7 @@ module Decidim
       end
 
       describe "scope" do
-        subject { described_class.from_params(params).scope }
+        subject { form.scope }
 
         context "when the scope exists" do
           it { is_expected.to be_kind_of(Decidim::Scope) }

data/decidim-proposals/spec/helpers/proposal_votes_helper_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe ProposalVotesHelper do
+      describe "#vote_button_classes" do
+        it "returns small buttons classes from proposals list" do
+          expect(helper.vote_button_classes(true)).to eq("small")
+        end
+
+        it "returns expanded buttons classes if it's not from proposals list'" do
+          expect(helper.vote_button_classes(false)).to eq("expanded button--sc")
+        end
+      end
+
+      describe "#votes_count_classes" do
+        it "returns small count classes from proposals list" do
+          expect(helper.votes_count_classes(true)).to eq(number: "card__support__number", label: "")
+        end
+
+        it "returns expanded count classes if it's not from proposals list'" do
+          expect(helper.votes_count_classes(false)).to eq(number: "extra__suport-number", label: "extra__suport-text")
+        end
+      end
+    end
+  end
+end

data/decidim-proposals/spec/lib/decidim/proposals/feature_spec.rb

@@ -22,7 +22,7 @@ describe "Proposals feature" do
       it "raises an error" do
         expect do
           Decidim::Admin::DestroyFeature.call(feature)
-        end.to raise_error
+        end.to broadcast(:invalid)
 
         expect(feature).to_not be_destroyed
       end