decidim 0.0.3 → 0.0.4

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

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

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

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 require "spec_helper"
 
@@ -49,13 +50,30 @@ describe "Orders", type: :feature do
           expect(page).to have_content project.title[I18n.locale]
         end
 
-        within ".budget-summary__progressbox" do
+        within "#order-progress .budget-summary__progressbox" do
           expect(page).to have_content "25%"
           expect(page).to have_selector("button.small:disabled")
         end
       end
     end
 
+    context "and isn't authorized" do
+      before do
+        feature.update_attribute(:permissions, vote: {
+                                   authorization_handler_name: "decidim/dummy_authorization_handler"
+                                 })
+        visit_feature
+      end
+
+      it "shows a modal dialog" do
+        within "#project-#{project.id}-item" do
+          page.find('.budget--list__action').click
+        end
+
+        expect(page).to have_content("Authorization required")
+      end
+    end
+
     context "and has pending order" do
       let!(:order) { create(:order, user: user, feature: feature) }
       let!(:line_item) { create(:line_item, order: order, project: project) }
@@ -72,7 +90,7 @@ describe "Orders", type: :feature do
         expect(page).not_to have_content "1 project selected"
         expect(page).not_to have_selector ".budget-summary__selected"
 
-        within ".budget-summary__progressbox" do
+        within "#order-progress .budget-summary__progressbox" do
           expect(page).to have_content "0%"
         end
 
@@ -105,7 +123,7 @@ describe "Orders", type: :feature do
 
           expect(page).to have_selector '.budget-list__data--added', count: 2
 
-          within ".budget-summary__progressbox" do
+          within "#order-progress .budget-summary__progressbox" do
             page.find('.button.small').click
           end
 
@@ -117,7 +135,7 @@ describe "Orders", type: :feature do
 
           expect(page).to have_content("successfully")
 
-          within ".budget-summary__progressbox" do
+          within "#order-progress .budget-summary__progressbox" do
             expect(page).not_to have_selector("button.small")
           end
         end
@@ -136,7 +154,7 @@ describe "Orders", type: :feature do
 
         expect(page).to have_content("successfully")
 
-        within ".budget-summary__progressbox" do
+        within "#order-progress .budget-summary__progressbox" do
           expect(page).to have_selector("button.small:disabled")
         end
 
@@ -146,4 +164,24 @@ describe "Orders", type: :feature do
       end
     end
   end
+
+  describe "show" do
+    let!(:project) { create(:project, feature: feature, budget: 25_000_000) }
+
+    before do
+      visit decidim_budgets.project_path(
+        id: project.id,
+        participatory_process_id: participatory_process,
+        feature_id: feature
+      )
+    end
+
+    let(:attached_to) { project }
+    it_behaves_like "has attachments"
+
+    it "shows the feature" do
+      expect(page).to have_i18n_content(project.title)
+      expect(page).to have_i18n_content(project.description)
+    end
+  end
 end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require_relative "../shared/admin_shared_context"
+require_relative "../shared/manage_attachments_examples"
+
+describe "Process admin manages project attachments", type: :feature do
+  include_context "admin"
+  let(:user) { process_admin }
+
+  it_behaves_like "manage project attachments"
+end

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

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

data/decidim-budgets/spec/forms/project_form_spec.rb

@@ -18,9 +18,6 @@ describe Decidim::Budgets::Admin::ProjectForm do
   let(:description) do
     Decidim::Faker::Localized.sentence(3)
   end
-  let(:short_description) do
-    Decidim::Faker::Localized.sentence(3)
-  end
   let(:budget) { Faker::Number.number(8) }
   let(:scope) { create :scope, organization: organization }
   let(:scope_id) { scope.id }
@@ -32,7 +29,6 @@ describe Decidim::Budgets::Admin::ProjectForm do
       decidim_category_id: category_id,
       title_en: title[:en],
       description_en: description[:en],
-      short_description_en: short_description[:en],
       budget: budget
     }
   end
@@ -53,12 +49,6 @@ describe Decidim::Budgets::Admin::ProjectForm do
     it { is_expected.not_to be_valid }
   end
 
-  describe "when short_description is missing" do
-    let(:short_description) { { en: nil } }
-
-    it { is_expected.not_to be_valid }
-  end
-
   describe "when budget is missing" do
     let(:budget) { nil }
 

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

@@ -0,0 +1,17 @@
+require "decidim/admin/test/manage_attachments_examples"
+
+RSpec.shared_examples "manage project attachments" do
+  let(:attached_to) { project }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
+
+    within find("tr", text: translated(project.title)) do
+      click_link "Attachments"
+    end
+  end
+
+  it_behaves_like "manage attachments examples"
+end

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

@@ -49,13 +49,6 @@ RSpec.shared_examples "manage projects" do
         es: "Mi proyecto",
         ca: "El meu projecte"
       )
-      fill_in_i18n_editor(
-        :project_short_description,
-        "#short_description-tabs",
-        en: "Short description",
-        es: "Descripción corta",
-        ca: "Descripció curta"
-      )
       fill_in_i18n_editor(
         :project_description,
         "#description-tabs",

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

@@ -22,6 +22,8 @@ module Decidim
         return broadcast(:invalid) if form.invalid?
 
         create_comment
+        send_notification_to_author unless @author == @commentable.author
+
         broadcast(:ok, @comment)
       end
 
@@ -36,6 +38,14 @@ module Decidim
                                    alignment: form.alignment,
                                    decidim_user_group_id: form.user_group_id)
       end
+
+      def send_notification_to_author
+        if @comment.depth > 0 && @commentable.author.replies_notifications?
+          CommentNotificationMailer.reply_created(@author, @comment, @commentable, @comment.root_commentable).deliver_later
+        elsif @comment.depth == 0 && @commentable.author.comments_notifications?
+          CommentNotificationMailer.comment_created(@author, @comment, @commentable).deliver_later
+        end
+      end
     end
   end
 end

data/decidim-comments/app/forms/decidim/comments/comment_form.rb

@@ -10,7 +10,7 @@ module Decidim
 
       mimic :comment
 
-      validates :body, presence: true
+      validates :body, presence: true, length: { maximum: 1000 }
       validates :alignment, inclusion: { in: [0, 1, -1] }, if: ->(form) { form.alignment.present? }
     end
   end

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

@@ -31,19 +31,34 @@ export class AddCommentForm extends Component {
     };
   }
 
+  componentDidMount() {
+    if ($(document).foundation) {
+      $(this.form).foundation();
+    }
+  }
+
   render() {
-    const { submitButtonClassName, commentableType, commentableId } = this.props;
+    const { submitButtonClassName, commentableType, commentableId, maxLength } = this.props;
     const { disabled } = this.state;
 
     return (
       <div className="add-comment">
         {this._renderHeading()}
         {this._renderOpinionButtons()}
-        <form onSubmit={(evt) => this._addComment(evt)}>
+        <form
+          onSubmit={(evt) => this._addComment(evt)}
+          data-abide
+          data-live-validate="true"
+          data-validate-on-blur="true"
+          ref={(form) => this.form = form}
+        >
           {this._renderCommentAs()}
           <div className="field">
             <label className="show-for-sr" htmlFor={`add-comment-${commentableType}-${commentableId}`}>{ I18n.t("components.add_comment_form.form.body.label") }</label>
             {this._renderTextArea()}
+            <span className="form-error">
+              { I18n.t("components.add_comment_form.form.form_error", { length: maxLength }) }
+            </span>
             <input
               type="submit"
               className={submitButtonClassName}
@@ -81,12 +96,15 @@ export class AddCommentForm extends Component {
    * @returns {Void|DOMElement} - The heading or an empty element
    */
   _renderTextArea() {
-    const { commentableType, commentableId, autoFocus} = this.props;
+    const { commentableType, commentableId, autoFocus, maxLength } = this.props;
 
     let textAreaProps = {
       ref: (textarea) => {this.bodyTextArea = textarea},
       id: `add-comment-${commentableType}-${commentableId}`,
       rows: "4",
+      maxLength,
+      required: "required",
+      pattern: `^(.){0,${maxLength}}$`,
       placeholder: I18n.t("components.add_comment_form.form.body.placeholder"),
       onChange: (evt) => this._checkCommentBody(evt.target.value)
     };
@@ -107,7 +125,7 @@ export class AddCommentForm extends Component {
   _renderOpinionButtons() {
     const { arguable } = this.props;
     const { alignment } = this.state;
-    const buttonClassName = classnames('button', 'small', 'button--muted');
+    const buttonClassName = classnames('button', 'tiny', 'button--muted');
     const okButtonClassName = classnames(buttonClassName, 'opinion-toggle--ok', {
       'is-active': alignment === 1
     });
@@ -126,7 +144,6 @@ export class AddCommentForm extends Component {
             onClick={() => this.setState({ alignment: 1 })}
           >
             <Icon name="icon-thumb-up" />
-            { I18n.t("components.add_comment_form.opinion.in_favor") }
           </button>
           <button
             className={neutralButtonClassName}
@@ -139,7 +156,6 @@ export class AddCommentForm extends Component {
             onClick={() => this.setState({ alignment: -1 })}
           >
             <Icon name="icon-thumb-down" />
-            { I18n.t("components.add_comment_form.opinion.against") }
           </button>
         </div>
       );
@@ -220,11 +236,6 @@ export class AddCommentForm extends Component {
   }
 }
 
-AddCommentForm.defaultProps = {
-  showTitle: true,
-  submitButtonClassName: 'button button--sc'
-};
-
 AddCommentForm.propTypes = {
   addComment: PropTypes.func.isRequired,
   session: PropTypes.shape({
@@ -243,7 +254,17 @@ AddCommentForm.propTypes = {
   submitButtonClassName: PropTypes.string.isRequired,
   onCommentAdded: PropTypes.func,
   arguable: PropTypes.bool,
-  autoFocus: PropTypes.bool
+  autoFocus: PropTypes.bool,
+  maxLength: PropTypes.number.isRequired
+};
+
+AddCommentForm.defaultProps = {
+  onCommentAdded: function() {},
+  showTitle: true,
+  submitButtonClassName: 'button button--sc',
+  arguable: false,
+  autoFocus: false,
+  maxLength: 1000
 };
 
 AddCommentForm.fragments = {

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

@@ -51,6 +51,12 @@ describe("<AddCommentForm />", () => {
     expect(wrapper).to.have.prop('submitButtonClassName').equal('button button--sc');
   });
 
+  it("should have a default prop maxLength of 1000", () => {
+    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentableId={commentableId} commentableType={commentableType} />);
+    expect(wrapper).to.have.prop('maxLength').equal(1000);
+  });
+
+
   it("should use prop submitButtonClassName as a className prop for submit button", () => {
     const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentableId={commentableId} commentableType={commentableType} submitButtonClassName="button small hollow" />);
     expect(wrapper.find('input[type="submit"]')).to.have.className('button');

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

@@ -241,11 +241,6 @@ Comment.fragments = {
   `
 };
 
-Comment.defaultProps = {
-  articleClassName: 'comment',
-  isRootComment: false
-};
-
 Comment.propTypes = {
   comment: PropTypes.oneOfType([
     propType(Comment.fragments.comment).isRequired,
@@ -259,4 +254,11 @@ Comment.propTypes = {
   votable: PropTypes.bool
 };
 
+Comment.defaultProps = {
+  articleClassName: 'comment',
+  isRootComment: false,
+  session: null,
+  votable: false
+};
+
 export default Comment;

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

@@ -44,7 +44,7 @@ class CommentOrderSelector extends Component {
                 <a href="" onClick={(event) => this._updateOrder(event, "older")} >
                   { I18n.t("components.comment_order_selector.order.older") }
                 </a>
-              </li>   
+              </li>
               <li>
                 <a href="" onClick={(event) => this._updateOrder(event, "most_discussed")} >
                   { I18n.t("components.comment_order_selector.order.most_discussed") }
@@ -57,7 +57,7 @@ class CommentOrderSelector extends Component {
     );
   }
 
-  _updateOrder(event, orderBy) {  
+  _updateOrder(event, orderBy) {
     event.preventDefault();
     this.setState({ orderBy });
     this.props.reorderComments(orderBy);

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

@@ -67,4 +67,9 @@ CommentThread.propTypes = {
   votable: PropTypes.bool
 };
 
+CommentThread.defaultProps = {
+  session: null,
+  votable: false
+};
+
 export default CommentThread;

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

@@ -107,6 +107,13 @@ Comments.propTypes = {
   reorderComments: PropTypes.func.isRequired
 };
 
+Comments.defaultProps = {
+  loading: false,
+  comments: null,
+  session: null,
+  commentableId: null
+};
+
 /**
  * Wrap the Comments component with a GraphQL query and children
  * fragments.
@@ -166,4 +173,8 @@ CommentsApplication.propTypes = {
   }).isRequired
 };
 
+CommentsApplication.defaultProps = {
+  commentableId: null
+};
+
 export default CommentsApplication;

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

@@ -24,4 +24,9 @@ VoteButton.propTypes = {
   disabled: PropTypes.bool
 };
 
+VoteButton.defaultProps = {
+  selectedClass: "selected",
+  disabled: false
+};
+
 export default VoteButton;

data/decidim-comments/app/frontend/comments/vote_button_component.test.jsx

@@ -12,7 +12,7 @@ describe("<VoteButton />", () => {
 
   it("should render the number of votes passed as a prop", () => {
     const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} />);
-    expect(wrapper.find('button')).to.include.text(10);
+    expect(wrapper.find('button').text()).to.match(/10/);
   });
 
   it("should render a button with the given buttonClassName", () => {