decidim 0.0.5 → 0.0.6

data/decidim-budgets/db/migrate/20170215132708_add_reference_to_projects.rb

@@ -0,0 +1,7 @@
+class AddReferenceToProjects < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_budgets_projects, :reference, :string
+    Decidim::Budgets::Project.find_each(&:save)
+    change_column_null :decidim_budgets_projects, :reference, false
+  end
+end

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

@@ -27,6 +27,8 @@ Decidim.register_feature(:budgets) do |feature|
 
   feature.settings(:step) do |settings|
     settings.attribute :comments_blocked, type: :boolean, default: false
+    settings.attribute :votes_enabled, type: :boolean, default: true
+    settings.attribute :show_votes, type: :boolean, default: false
   end
 
   feature.seeds do
@@ -54,13 +56,13 @@ Decidim.register_feature(:budgets) do |feature|
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(Decidim::Dev.asset("city.jpeg")),
+          file: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
           attached_to: project
         )
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(Decidim::Dev.asset("Exampledocument.pdf")),
+          file: File.new(File.join(File.dirname(__FILE__), "seeds", "Exampledocument.pdf")),
           attached_to: project
         )
         Decidim::Comments::Seed.comments_for(project)

data/decidim-budgets/lib/decidim/budgets/test/factories.rb

@@ -6,7 +6,7 @@ FactoryGirl.define do
   factory :budget_feature, parent: :feature do
     name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :budgets).i18n_name }
     manifest_name :budgets
-    participatory_process
+    participatory_process { create(:participatory_process, :with_steps) }
 
     trait :with_total_budget_and_vote_threshold_percent do
       transient do
@@ -21,6 +21,26 @@ FactoryGirl.define do
         }
       end
     end
+
+    trait :with_votes_disabled do
+      step_settings do
+        {
+          participatory_process.active_step.id => {
+            votes_enabled: false
+          }
+        }
+      end
+    end
+
+    trait :with_show_votes_enabled do
+      step_settings do
+        {
+          participatory_process.active_step.id => {
+            show_votes: true
+          }
+        }
+      end
+    end
   end
 
   factory :project, class: Decidim::Budgets::Project do

data/decidim-budgets/spec/commands/add_line_item_spec.rb

@@ -2,7 +2,8 @@ require "spec_helper"
 
 describe Decidim::Budgets::AddLineItem do
   let(:user) { create(:user) }
-  let(:feature) { create(:budget_feature, organization: user.organization, settings: settings) }
+  let(:participatory_process) { create :participatory_process, :with_steps, organization: user.organization }
+  let(:feature) { create(:budget_feature, participatory_process: participatory_process, settings: settings) }
   let(:project) { create(:project, feature: feature, budget: 60_000) }
   let(:settings) { { "total_budget" => 100_000, vote_threshold_percent: 50 }}
   let(:order) { nil }
@@ -58,4 +59,12 @@ describe Decidim::Budgets::AddLineItem do
       expect { subject.call }.to broadcast(:invalid)
     end
   end
+
+  context "when the votes are not enabled" do
+    let(:feature) { create(:budget_feature, :with_votes_disabled, participatory_process: participatory_process, settings: settings) }
+
+    it "broadcasts invalid" do
+      expect { subject.call }.to broadcast(:invalid)
+    end
+  end
 end

data/decidim-budgets/spec/features/comments_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe "Comments", type: :feature, perform_enqueued: true do
+  let!(:feature) { create(:budget_feature, organization: organization) }
+  let!(:commentable) { create(:project, feature: feature) }
+
+  let(:resource_path) { decidim_budgets.project_path(commentable, feature_id: feature, participatory_process_id: feature.participatory_process) }
+  include_examples "comments"
+end

data/decidim-budgets/spec/features/orders_spec.rb

@@ -32,11 +32,12 @@ describe "Orders", type: :feature do
   context "when the user is logged in" do
     before do
       login_as user, scope: :user
-      visit_feature
     end
 
     context "and has not a pending order" do
       it "adds a project to the current order" do
+        visit_feature
+
         within "#project-#{project.id}-item" do
           page.find('.budget--list__action').click
         end
@@ -62,10 +63,11 @@ describe "Orders", type: :feature do
         feature.update_attribute(:permissions, vote: {
                                    authorization_handler_name: "decidim/dummy_authorization_handler"
                                  })
-        visit_feature
       end
 
       it "shows a modal dialog" do
+        visit_feature
+
         within "#project-#{project.id}-item" do
           page.find('.budget--list__action').click
         end
@@ -80,6 +82,7 @@ describe "Orders", type: :feature do
 
       it "removes a project from the current order" do
         visit_feature
+
         expect(page).to have_content "ASSIGNED: €25,000,000"
 
         within "#project-#{project.id}-item" do
@@ -145,7 +148,7 @@ describe "Orders", type: :feature do
     context "and has a finished order" do
       let!(:order) do
         order = create(:order, user: user, feature: feature)
-        order.projects << projects
+        order.projects = projects
         order.checked_out_at = Time.current
         order.save!
         order
@@ -169,6 +172,47 @@ describe "Orders", type: :feature do
         end
       end
     end
+
+    context "and votes are disabled" do
+      let!(:feature) do
+        create(:budget_feature,
+              :with_votes_disabled,
+              manifest: manifest,
+              participatory_process: participatory_process)
+      end
+
+      it "cannot create new orders" do
+        visit_feature
+
+        expect(page).to have_selector('button.budget--list__action[disabled]', count: 3)
+        expect(page).to have_no_selector('.budget-summary')
+      end
+    end
+
+    context "and show votes are enabled" do
+      let!(:feature) do
+        create(:budget_feature,
+              :with_show_votes_enabled,
+              manifest: manifest,
+              participatory_process: participatory_process)
+      end
+
+      let!(:order) do
+        order = create(:order, user: user, feature: feature)
+        order.projects = projects
+        order.checked_out_at = Time.current
+        order.save!
+        order
+      end
+
+      it "displays the number of votes for a project" do
+        visit_feature
+
+        within "#project-#{project.id}-item" do
+          expect(page).to have_content("1 SUPPORT")
+        end
+      end
+    end
   end
 
   describe "show" do

data/decidim-budgets/spec/models/project_spec.rb

@@ -3,9 +3,11 @@
 require "spec_helper"
 
 describe Decidim::Budgets::Project do
-  let(:project) { build :project }
+  let(:project) { create :project }
   subject { project }
 
+  include_examples "has reference"
+
   it { is_expected.to be_valid }
 
   context "without a feature" do
@@ -27,4 +29,17 @@ describe Decidim::Budgets::Project do
 
     it { is_expected.not_to be_valid }
   end
+
+  context "#orders_count" do
+    let(:project) { create :project, budget: 75_000_000 }
+    let(:order) { create :order, feature: project.feature }
+    let(:unfinished_order) { create :order, feature: project.feature }
+    let!(:line_item) { create :line_item, project: project, order: order }
+    let!(:line_item_1) { create :line_item, project: project , order: unfinished_order}
+
+    it "return number of finished orders for this project" do
+      order.reload.update_attributes!(checked_out_at: Time.current)
+      expect(project.confirmed_orders_count).to eq(1)
+    end
+  end
 end

data/decidim-budgets/spec/services/project_search_spec.rb

@@ -65,6 +65,15 @@ describe Decidim::Budgets::ProjectSearch do
           expect(subject.results).to match_array [project1,project2]
         end
       end
+
+      context "when `global` is being sent" do
+        let!(:resource_without_scope) { create(:project, feature: current_feature, scope: nil)}
+        let(:params) { default_params.merge(scope_id: ["global"]) }
+
+        it "returns resources without a scope" do
+          expect(subject.results).to eq [resource_without_scope]
+        end
+      end
     end
 
     context "category_id" do

data/decidim-budgets/spec/shared/admin_shared_context.rb

@@ -1,6 +1,6 @@
 RSpec.shared_context "admin" do
   let(:organization) { create(:organization) }
-  let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@decidim.org") }
+  let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@example.org") }
   let(:participatory_process) { create(:participatory_process, :with_steps, organization: organization) }
   let(:process_admin) { create :user, :confirmed, organization: organization }
   let!(:user_role) { create :participatory_process_user_role, user: process_admin, participatory_process: participatory_process }

data/decidim-budgets/spec/shared/manage_projects_examples.rb

@@ -38,6 +38,28 @@ RSpec.shared_examples "manage projects" do
     end
   end
 
+  context "seeing finished and pending orders" do
+    let!(:project) { create(:project, budget: 70_000_000, feature: current_feature) }
+
+    let!(:finished_orders) do
+      orders = create_list(:order, 10, feature: current_feature)
+      orders.each do |order|
+        order.update_attribute(:line_items, [create(:line_item, project: project, order: order)])
+        order.update_attribute(:checked_out_at, Date.today)
+      end
+    end
+
+    let!(:pending_orders) do
+      create_list(:order, 5, feature: current_feature, checked_out_at: nil)
+    end
+
+    it "shows the order count" do
+      visit current_path
+      expect(page).to have_content("Finished orders: 10")
+      expect(page).to have_content("Pending orders: 5")
+    end
+  end
+
   it "creates a new project" do
     find(".actions .new").click
 

data/decidim-comments/app/commands/decidim/comments/create_comment.rb

@@ -22,7 +22,7 @@ module Decidim
         return broadcast(:invalid) if form.invalid?
 
         create_comment
-        send_notification_to_author unless @author == @commentable.author
+        send_notification_to_author if has_author? && !same_author?
 
         broadcast(:ok, @comment)
       end
@@ -46,6 +46,14 @@ module Decidim
           CommentNotificationMailer.comment_created(@author, @comment, @commentable).deliver_later
         end
       end
+
+      def has_author?
+        @commentable.respond_to?(:author) && @commentable.author.present?
+      end
+
+      def same_author?
+        @author == @commentable.author
+      end
     end
   end
 end

data/decidim-comments/app/frontend/application/icon.component.jsx

@@ -10,7 +10,7 @@ const Icon = ({ name, iconExtraClassName }) => {
   return (
     <svg className={`icon ${iconExtraClassName} ${name}`}>
       <use xmlnsXlink="http://www.w3.org/1999/xlink" xlinkHref={`${assetUrl('icons.svg')}#${name}`} />
-    </svg>  
+    </svg>
   );
 };
 

data/decidim-comments/app/frontend/comments/add_comment_form.component.jsx

@@ -104,12 +104,11 @@ export class AddCommentForm extends Component {
             <label className="show-for-sr" htmlFor={`add-comment-${type}-${id}`}>{ I18n.t("components.add_comment_form.form.body.label") }</label>
             {this._renderTextArea()}
             {this._renderTextAreaError()}
-            <input
-              type="submit"
-              className={submitButtonClassName}
-              value={I18n.t("components.add_comment_form.form.submit")}
-              disabled={disabled}
-            />
+            <button type="submit"
+                    className={submitButtonClassName}
+                    disabled={disabled}>
+              {I18n.t("components.add_comment_form.form.submit")}
+            </button>
           </div>
         </form>
       );
@@ -183,7 +182,7 @@ export class AddCommentForm extends Component {
     const koButtonClassName = classnames(buttonClassName, 'opinion-toggle--ko', {
       'is-active': alignment === -1
     });
-    const neutralButtonClassName = classnames(buttonClassName, 'opinion-toggle--neutral', {
+    const neutralButtonClassName = classnames(buttonClassName, 'opinion-toggle--meh', {
       'is-active': alignment === 0
     });
 
@@ -194,7 +193,7 @@ export class AddCommentForm extends Component {
             className={okButtonClassName}
             onClick={() => this.setState({ alignment: 1 })}
           >
-            <Icon name="icon-thumb-up" />
+            <Icon iconExtraClassName="" name="icon-thumb-up" />
           </button>
           <button
             className={neutralButtonClassName}
@@ -206,7 +205,7 @@ export class AddCommentForm extends Component {
             className={koButtonClassName}
             onClick={() => this.setState({ alignment: -1 })}
           >
-            <Icon name="icon-thumb-down" />
+            <Icon iconExtraClassName="" name="icon-thumb-down" />
           </button>
         </div>
       );
@@ -353,6 +352,7 @@ const AddCommentFormWithMutation = graphql(gql`
           addComment: {
             __typename: 'Comment',
             id: uuid(),
+            sgid: uuid(),
             type: "Decidim::Comments::Comment",
             createdAt: new Date().toISOString(),
             body,
@@ -368,7 +368,8 @@ const AddCommentFormWithMutation = graphql(gql`
             upVotes: 0,
             upVoted: false,
             downVotes: 0,
-            downVoted: false
+            downVoted: false,
+            alreadyReported: false
           }
         }
       },

data/decidim-comments/app/frontend/comments/add_comment_form.component.test.jsx

@@ -61,9 +61,9 @@ describe("<AddCommentForm />", () => {
 
   it("should use prop submitButtonClassName as a className prop for submit button", () => {
     const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} submitButtonClassName="button small hollow" />);
-    expect(wrapper.find('input[type="submit"]')).to.have.className('button');
-    expect(wrapper.find('input[type="submit"]')).to.have.className('small');
-    expect(wrapper.find('input[type="submit"]')).to.have.className('hollow');
+    expect(wrapper.find('button[type="submit"]')).to.have.className('button');
+    expect(wrapper.find('button[type="submit"]')).to.have.className('small');
+    expect(wrapper.find('button[type="submit"]')).to.have.className('hollow');
   });
 
   it("should enable the submit button if textarea is not blank", () => {
@@ -73,7 +73,7 @@ describe("<AddCommentForm />", () => {
         value: 'This is a comment'
       }
     });
-    expect(wrapper.find('input[type="submit"]')).not.to.be.disabled();
+    expect(wrapper.find('button[type="submit"]')).not.to.be.disabled();
   });
 
   it("should disable the submit button if textarea is blank", () => {
@@ -88,7 +88,7 @@ describe("<AddCommentForm />", () => {
         value: ''
       }
     });
-    expect(wrapper.find('input[type="submit"]')).to.be.disabled();
+    expect(wrapper.find('button[type="submit"]')).to.be.disabled();
   });
 
   it("should not render a div with class 'opinion-toggle'", () => {

data/decidim-comments/app/frontend/comments/comment.component.jsx

@@ -1,3 +1,4 @@
+/* eslint-disable max-lines, camelcase */
 import { Component, PropTypes } from 'react';
 import { propType }             from 'graphql-anywhere';
 import gql                      from 'graphql-tag';
@@ -8,6 +9,7 @@ import classnames               from 'classnames';
 import AddCommentForm           from './add_comment_form.component';
 import UpVoteButton             from './up_vote_button.component';
 import DownVoteButton           from './down_vote_button.component';
+import Icon                     from '../application/icon.component';
 
 import commentFragment          from './comment.fragment.graphql';
 import commentDataFragment      from './comment_data.fragment.graphql';
@@ -26,9 +28,21 @@ class Comment extends Component {
     };
   }
 
+  componentDidMount() {
+    if ($(document).foundation) {
+      const { comment: { id } } = this.props;
+      $(`#flagModalComment${id}`).foundation();
+    }
+  }
+
   render() {
-    const { comment: { id, author, body, createdAt }, articleClassName } = this.props;
+    const { session, comment: { id, author, body, createdAt }, articleClassName } = this.props;
     const formattedCreatedAt = ` ${moment(createdAt).format("LLL")}`;
+    let modalName = 'loginModal';
+
+    if (session && session.user) {
+      modalName = `flagModalComment${id}`;
+    }
 
     return (
       <article id={`comment_${id}`} className={articleClassName}>
@@ -43,6 +57,12 @@ class Comment extends Component {
                 <time dateTime={createdAt}>{formattedCreatedAt}</time>
               </div>
             </div>
+            <div className="author-data__extra">
+              <button type="button" title={ I18n.t("components.comment.report.title") } data-open={modalName}>
+                <Icon name="icon-flag" iconExtraClassName="icon--small"></Icon>
+              </button>
+              {this._renderFlagModal()}
+            </div>
           </div>
         </div>
         <div className="comment__content">
@@ -223,6 +243,76 @@ class Comment extends Component {
 
     return null;
   }
+
+  /**
+   * Render a modal to report the comment.
+   * @private
+   * @return {Void|DOMElement} - The comment's report modal or not.
+   */
+  _renderFlagModal() {
+    const { session, comment: { id, sgid, alreadyReported } } = this.props;
+    const authenticityToken = this._getAuthenticityToken();
+
+    if (session && session.user) {
+      return (
+        <div className="reveal flag-modal" id={`flagModalComment${id}`} data-reveal>
+          <div className="reveal__header">
+            <h3 className="reveal__title">{ I18n.t("components.comment.report.title") }</h3>
+            <button
+              className="close-button"
+              aria-label={ I18n.t("components.comment.report.close") }
+              type="button"
+              onClick={() => $(`#flagModalComment${id}`).foundation('close')}>
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          {
+            (() => {
+              if (alreadyReported) {
+                return (
+                  <p key={`already-reported-comment-${id}`}>{ I18n.t("components.comment.report.already_reported") }</p>
+                );
+              }
+              return [
+                <p key={`report-description-comment-${id}`}>{ I18n.t("components.comment.report.description") }</p>,
+                <form key={`report-form-comment-${id}`} method="post" action={`/report?sgid=${sgid}`}>
+                  <input type="hidden" name="authenticity_token" value={authenticityToken} />
+                  <label htmlFor={`report_comment_${id}_reason_spam`}>
+                    <input type="radio" value="spam" name="report[reason]" id={`report_comment_${id}_reason_spam`} defaultChecked />
+                    { I18n.t("components.comment.report.reasons.spam") }
+                  </label>
+                  <label htmlFor={`report_comment_${id}_reason_offensive`}>
+                    <input type="radio" value="offensive" name="report[reason]" id={`report_comment_${id}_reason_offensive`} />
+                    { I18n.t("components.comment.report.reasons.offensive") }
+                  </label>
+                  <label htmlFor={`report_comment_${id}_reason_does_not_belong`}>
+                    <input type="radio" value="does_not_belong" name="report[reason]" id={`report_comment_${id}_reason_does_not_belong`} />
+                    { I18n.t("components.comment.report.reasons.does_not_belong", { organization_name: session.user.organizationName }) }
+                  </label>
+                  <label htmlFor={`report_comment_${id}_details`}>
+                    { I18n.t("components.comment.report.details") }
+                    <textarea rows="4" name="report[details]" id={`report_comment_${id}_details`} />
+                  </label>
+                  <button type="submit" name="commit" className="button">{ I18n.t("components.comment.report.action") }</button>
+                </form>
+              ];
+            })()
+          }
+        </div>
+      );
+    }
+
+    return null;
+  }
+
+  /**
+   * Get Rails authenticity token so we can send requests through the report forms.
+   * @private
+   * @return {string} - The current authenticity token.
+  */
+  _getAuthenticityToken() {
+    return $('meta[name="csrf-token"]').attr('content');
+  }
 }
 
 Comment.fragments = {