decidim 0.0.3 → 0.0.4

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

@@ -33,7 +33,7 @@ describe "Vote Proposal", type: :feature do
     context "when the user is not logged in" do
       it "should be given the option to sign in" do
         visit_feature
-        
+
         within ".card__support", match: :first do
           page.find('.card__button').click
         end
@@ -102,6 +102,21 @@ describe "Vote Proposal", type: :feature do
           end
         end
 
+        context "when the proposal is not voted yet but the user isn't authorized" do
+          before do
+            feature.update_attribute(:permissions, vote: { authorization_handler_name: "decidim/dummy_authorization_handler" })
+            visit_feature
+          end
+
+          it "should show a modal dialog" do
+            within "#proposal-#{proposal.id}-vote-button" do
+              page.find('.card__button').click
+            end
+
+            expect(page).to have_content("Authorization required")
+          end
+        end
+
         context "when the proposal is already voted" do
           before do
             create(:proposal_vote, proposal: proposal, author: user)

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "spec_helper"
-require_relative "../../../shared/proposal_form_examples"
 
 module Decidim
   module Proposals

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "spec_helper"
-require_relative "../../../shared/proposal_form_examples"
 
 module Decidim
   module Proposals

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

@@ -6,6 +6,7 @@ module Decidim
     describe ProposalVotesHelper do
       let(:organization) { create(:organization) }
       let(:vote_limit) { 10 }
+      let(:votes_enabled) { true }
       let(:proposal_feature) { create(:proposal_feature, organization: organization) }
       let(:user) { create(:user, organization: organization) }
 
@@ -13,6 +14,7 @@ module Decidim
         allow(helper).to receive(:current_user).and_return(user)
         allow(helper).to receive(:current_feature).and_return(proposal_feature)
         allow(helper).to receive(:feature_settings).and_return(double(vote_limit: vote_limit))
+        allow(helper).to receive(:current_settings).and_return(double(votes_enabled?: votes_enabled))
       end
 
       describe "#vote_button_classes" do
@@ -45,6 +47,14 @@ module Decidim
           end
         end
 
+        context "when the step_settings votes_enabled is false" do
+          let(:votes_enabled) { false }
+
+          it "returns false" do
+            expect(helper.vote_limit_enabled?).to be_falsy
+          end
+        end
+
         context "when the current_settings vote_limit is not present" do
           let(:vote_limit) { nil }
 

data/decidim-proposals/spec/services/decidim/proposals/proposal_search_spec.rb

@@ -4,36 +4,33 @@ module Decidim
   module Proposals
     describe ProposalSearch do
       let(:feature) { create(:feature, manifest_name: "proposals") }
+      let(:scope1) { create :scope, organization: feature.organization }
+      let(:scope2) { create :scope, organization: feature.organization }
+      let(:participatory_process) { feature.participatory_process }
       let(:user) { create(:user, organization: feature.organization) }
-      let!(:proposal) { create(:proposal, feature: feature)}
+      let!(:proposal) { create(:proposal, feature: feature, scope: scope1)}
 
       describe "results" do
-        let(:random_seed) { 0.2 }
         let(:activity) { [] }
         let(:search_text) { nil }
         let(:origin) { nil }
+        let(:related_to) { nil }
         let(:state) { nil }
+        let(:scope_id) { nil }
 
         subject do
           described_class.new({
             feature: feature,
-            random_seed: random_seed,
             activity: activity,
             search_text: search_text,
             state: state,
             origin: origin,
+            related_to: related_to,
+            scope_id: scope_id,
             current_user: user
           }).results
         end
 
-        context "when given a random seed" do
-          it "sets the seed at the database" do
-            allow(Proposal.connection).to receive(:execute).with(anything)
-            expect(Proposal.connection).to receive(:execute).with("SELECT setseed(0.2)").and_call_original
-            subject
-          end
-        end
-
         it "only includes proposals from the given feature" do
           other_proposal = create(:proposal)
 
@@ -41,12 +38,6 @@ module Decidim
           expect(subject).not_to include(other_proposal)
         end
 
-        it "randomizes the order of proposals" do
-          allow(Proposal.connection).to receive(:execute).with(anything)
-          expect_any_instance_of(Decidim::Proposals::Proposal::ActiveRecord_Relation).to receive(:reorder).with("RANDOM()").and_call_original
-          subject
-        end
-
         describe "when the filter includes search_text" do
           let(:search_text) { "dog" }
 
@@ -122,26 +113,60 @@ module Decidim
             end
           end
         end
-      end
 
-      describe "random_seed" do
-        subject do
-          described_class.new({
-            feature: feature,
-            random_seed: random_seed
-          }).random_seed
-        end
+        context "scope_id" do
+          let!(:proposal2) { create(:proposal, feature: feature, scope: scope2)}
+
+          context "when a single id is being sent" do
+            let(:scope_id) { scope1.id }
+
+            it "filters meetings by scope" do
+              expect(subject).to eq [proposal]
+            end
+          end
 
-        context "without a given random seed" do
-          let(:random_seed) { nil }
+          context "when multiple ids are sent" do
+            let(:scope_id) { [scope2.id, scope1.id] }
 
-          it { is_expected.to be_within(1).of(0.0) }
+            it "filters meetings by scope" do
+              expect(subject).to match_array [proposal, proposal2]
+            end
+          end
         end
 
-        context "with an invalid random seed" do
-          let(:random_seed) { ["foo", 2, -10].sample }
+        describe "when the filter includes related_to" do
+          context "when filtering by related to meetings" do
+            let(:related_to) { "Decidim::Meetings::Meeting".underscore }
+            let(:meetings_feature) { create(:feature, manifest_name: "meetings", participatory_process: participatory_process) }
+            let(:meeting) { create :meeting, feature: meetings_feature }
+
+            it "returns only proposals related to meetings" do
+              related_proposal = create(:proposal, :accepted, feature: feature)
+              related_proposal_2 = create(:proposal, :accepted, feature: feature)
+              create_list(:proposal, 3, feature: feature)
+              meeting.link_resources([related_proposal], "proposals_from_meeting")
+              related_proposal_2.link_resources([meeting], "proposals_from_meeting")
+
+              expect(subject).to match_array([related_proposal, related_proposal_2])
+            end
+          end
 
-          it { is_expected.to be_within(1).of(0.0) }
+          context "when filtering by related to results" do
+            let(:related_to) { "Decidim::Results::Result".underscore }
+            let(:results_feature) { create(:feature, manifest_name: "results", participatory_process: participatory_process) }
+            let(:result) { create :result, feature: results_feature }
+
+
+            it "returns only proposals related to results" do
+              related_proposal = create(:proposal, :accepted, feature: feature)
+              related_proposal_2 = create(:proposal, :accepted, feature: feature)
+              create_list(:proposal, 3, feature: feature)
+              result.link_resources([related_proposal], "included_proposals")
+              related_proposal_2.link_resources([result], "included_proposals")
+
+              expect(subject).to match_array([related_proposal, related_proposal_2])
+            end
+          end
         end
       end
     end

data/decidim-proposals/spec/shared/create_proposal_examples.rb

@@ -16,8 +16,8 @@ RSpec.shared_examples "create a proposal" do |with_author|
   describe "call" do
     let(:form_params) do
       {
-        title: "Proposal title",
-        body: "Proposal body"
+        title: "A reasonable proposal title",
+        body: "A reasonable proposal body"
       }
     end
 

data/decidim-results/app/views/decidim/results/admin/results/edit.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

data/decidim-results/app/views/decidim/results/admin/results/new.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

data/decidim-results/app/views/decidim/results/results/index.html.erb

@@ -1,4 +1,6 @@
-<% content_for(:title, t(".title")) %>
+<% add_meta_tags({
+  title: t(".meta_title", feature_name: translated_attribute(current_feature.name))
+}) %>
 
 <div class="row columns">
   <div class="title-action">

data/decidim-results/app/views/decidim/results/results/show.html.erb

@@ -1,4 +1,10 @@
-<% content_for(:title, translated_attribute(result.title)) %>
+<% provide(:title, translated_attribute(result.title)) %>
+
+<% add_meta_tags({
+  description: translated_attribute(result.description),
+  title: translated_attribute(result.title),
+  url: result_url(result.id)
+}) %>
 
 <div class="row column view-header">
   <h2 class="heading2"><%= translated_attribute result.title %></h2>
@@ -34,6 +40,7 @@
         </div>
       </div>
     </div>
+    <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
@@ -50,3 +57,6 @@
     <%= comments_for result, arguable: true, votable: true %>
   <% end %>
 <% end %>
+
+<%= javascript_include_tag "decidim/proposals/social_share" %>
+<%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/decidim-results/config/locales/ca.yml

@@ -50,12 +50,12 @@ ca:
           scopes: Àmbits
           search: Cerca
         index:
-          title: Resultats
+          meta_title: "%{feature_name}"
         show:
           stats:
             attendees: Assistents
             comments: Comentaris
             contributions: Aportacions
-            meetings: Llistat de trobades
+            meetings: Trobades
             proposals: Propostes
             votes: Suports

data/decidim-results/config/locales/en.yml

@@ -51,7 +51,7 @@ en:
           scopes: Scopes
           search: Search
         index:
-          title: Results
+          meta_title: "%{feature_name}"
         show:
           stats:
             attendees: Attendees

data/decidim-results/config/locales/es.yml

@@ -50,7 +50,7 @@ es:
           scopes: Ámbitos
           search: Buscar
         index:
-          title: Resultados
+          meta_title: "%{feature_name}"
         show:
           stats:
             attendees: Asistentes

data/decidim-results/config/locales/eu.yml

@@ -0,0 +1,5 @@
+eu:
+  decidim:
+    features:
+      results:
+        name: Emaitzak

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

@@ -31,6 +31,7 @@ Decidim.register_feature(:results) do |feature|
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :results).i18n_name,
         manifest_name: :results,
+        published_at: Time.current,
         participatory_process: process
       )
 

data/decidim-results/spec/features/admin_manages_results_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/admin_shared_context"
-require_relative "../shared/manage_results_examples"
 
 describe "Admin manages results", type: :feature do
   include_context "admin"

data/decidim-results/spec/features/process_admin_manages_results_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/admin_shared_context"
-require_relative "../shared/manage_results_examples"
 
 describe "Process admin manages results", type: :feature do
   include_context "admin"

data/decidim-system/app/assets/stylesheets/decidim/system/_foundation_and_overrides.scss

@@ -26,7 +26,7 @@
 @include foundation-drilldown-menu;
 @include foundation-dropdown;
 @include foundation-dropdown-menu;
-@include foundation-flex-video;
+@include foundation-responsive-embed;
 @include foundation-label;
 @include foundation-media-object;
 @include foundation-menu;

data/decidim-system/app/controllers/decidim/system/application_controller.rb

@@ -7,6 +7,7 @@ module Decidim
       protect_from_forgery with: :exception, prepend: true
 
       helper Decidim::TranslationsHelper
+      helper Decidim::DecidimFormHelper
     end
   end
 end

data/decidim-system/app/controllers/decidim/system/devise/sessions_controller.rb

@@ -5,6 +5,7 @@ module Decidim
       # Custom Sessions controller for Devise in order to use a custom layout
       # and views.
       class SessionsController < ::Devise::SessionsController
+        helper Decidim::DecidimFormHelper
         layout "decidim/system/login"
       end
     end

data/decidim-system/app/views/decidim/system/admins/edit.html.erb

@@ -1,8 +1,8 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

data/decidim-system/app/views/decidim/system/admins/index.html.erb

@@ -1,4 +1,4 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
 

data/decidim-system/app/views/decidim/system/admins/new.html.erb

@@ -1,8 +1,8 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

data/decidim-system/app/views/decidim/system/admins/show.html.erb

@@ -1,4 +1,4 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= link_to @admin.email, @admin %></h2>
 <% end %>
 

data/decidim-system/app/views/decidim/system/dashboard/show.html.erb

@@ -1,3 +1,3 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t("decidim.system.titles.dashboard") %></h2>
 <% end %>

data/decidim-system/app/views/decidim/system/devise/passwords/edit.html.erb

@@ -1,6 +1,6 @@
 <h2>Change your password</h2>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+<%= decidim_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
   <%= f.hidden_field :reset_password_token %>
 

data/decidim-system/app/views/decidim/system/devise/passwords/new.html.erb

@@ -1,6 +1,6 @@
 <h2>Forgot your password?</h2>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+<%= decidim_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= devise_error_messages! %>
 
   <div class="field">

data/decidim-system/app/views/decidim/system/devise/sessions/new.html.erb

@@ -1,6 +1,6 @@
 <h2>Log in</h2>
 
-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+<%= decidim_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="field">
     <%= f.email_field :email, autofocus: true %>
   </div>