decidim 0.0.2 → 0.0.3

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Budgets::Project do
+  let(:project) { build :project }
+  subject { project }
+
+  it { is_expected.to be_valid }
+
+  context "without a feature" do
+    let(:project) { build :project, feature: nil }
+
+    it { is_expected.not_to be_valid }
+  end
+
+  context "when the scope is from another organization" do
+    let(:scope) { create :scope }
+    let(:project) { build :project, scope: scope }
+
+    it { is_expected.not_to be_valid }
+  end
+
+  context "when the category is from another organization" do
+    let(:category) { create :category }
+    let(:project) { build :project, category: category }
+
+    it { is_expected.not_to be_valid }
+  end
+end

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

@@ -0,0 +1,97 @@
+require "spec_helper"
+
+describe Decidim::Budgets::ProjectSearch do
+  let(:current_feature) { create :budget_feature }
+  let(:scope1) { create :scope, organization: current_feature.organization }
+  let(:scope2) { create :scope, organization: current_feature.organization }
+  let(:parent_category) { create :category, participatory_process: current_feature.participatory_process }
+  let(:subcategory) { create :subcategory, parent: parent_category }
+  let!(:project1) do
+    create(
+      :project,
+      feature: current_feature,
+      category: parent_category,
+      scope: scope1
+    )
+  end
+  let!(:project2) do
+    create(
+      :project,
+      feature: current_feature,
+      category: subcategory,
+      scope: scope2
+    )
+  end
+  let(:external_project) { create :project }
+  let(:feature_id) { current_feature.id }
+  let(:organization_id) { current_feature.organization.id }
+  let(:default_params) { { feature: current_feature } }
+  let(:params) { default_params }
+
+  subject { described_class.new(params) }
+
+  describe "base query" do
+    context "when no feature is passed" do
+      let(:default_params) { { feature: nil } }
+
+      it "raises an error" do
+        expect{ subject.results }.to raise_error(StandardError, "Missing feature")
+      end
+    end
+  end
+
+  describe "filters" do
+    context "feature_id" do
+      it "only returns projects from the given feature" do
+        external_project = create(:project)
+
+        expect(subject.results).not_to include(external_project)
+      end
+    end
+
+    context "scope_id" do
+      context "when a single id is being sent" do
+        let(:params) { default_params.merge(scope_id: scope1.id) }
+
+        it "filters projects by scope" do
+          expect(subject.results).to eq [project1]
+        end
+      end
+
+      context "when multiple ids are sent" do
+        let(:params) { default_params.merge(scope_id: [scope2.id, scope1.id]) }
+
+        it "filters projects by scope" do
+          expect(subject.results).to match_array [project1,project2]
+        end
+      end
+    end
+
+    context "category_id" do
+      context "when the given category has no subcategories" do
+        let(:params) { default_params.merge(category_id: subcategory.id) }
+
+        it "returns only projects from the given category" do
+          expect(subject.results).to eq [project2]
+        end
+      end
+
+      context "when the given category has some subcategories" do
+        let(:params) { default_params.merge(category_id: parent_category.id) }
+
+        it "returns projects from this category and its children's" do
+          expect(subject.results).to match_array [project2, project1]
+        end
+      end
+
+      context "when the category does not belong to the current feature" do
+        let(:external_category) { create :category }
+        let(:params) { default_params.merge(category_id: external_category.id) }
+
+        it "returns an empty array" do
+          expect(subject.results).to eq []
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+RSpec.shared_context "admin" do
+  let(:organization) { create(:organization) }
+  let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@decidim.org") }
+  let(:participatory_process) { create(:participatory_process, 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 }
+  let(:current_feature) { create :feature, participatory_process: participatory_process, manifest_name: "budgets" }
+  let(:scope) { create :scope, organization: organization }
+  let!(:category) { create :category, participatory_process: participatory_process }
+  let!(:project) { create :project, scope: scope, feature: current_feature }
+end

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

@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+RSpec.shared_examples "manage projects" do
+  it "updates a project" do
+    within find("tr", text: translated(project.title)) do
+      click_link "Edit"
+    end
+
+    within ".edit_project" do
+      fill_in_i18n(
+        :project_title,
+        "#title-tabs",
+        en: "My new title",
+        es: "Mi nuevo título",
+        ca: "El meu nou títol"
+      )
+
+      find("*[type=submit]").click
+    end
+
+    within ".flash" do
+      expect(page).to have_content("successfully")
+    end
+
+    within "table" do
+      expect(page).to have_content("My new title")
+    end
+  end
+
+  context "previewing projects" do
+    it "allows the user to preview the project" do
+      new_window = window_opened_by { click_link translated(project.title) }
+
+      within_window new_window do
+        expect(current_path).to eq decidim_budgets.project_path(id: project.id, participatory_process_id: participatory_process.id, feature_id: current_feature.id)
+        expect(page).to have_content(translated(project.title))
+      end
+    end
+  end
+
+  it "creates a new project" do
+    find(".actions .new").click
+
+    within ".new_project" do
+      fill_in_i18n(
+        :project_title,
+        "#title-tabs",
+        en: "My project",
+        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",
+        en: "A longer description",
+        es: "Descripción más larga",
+        ca: "Descripció més llarga"
+      )
+      fill_in :project_budget, with: 22_000_000
+
+      select scope.name, from: :project_decidim_scope_id
+      select translated(category.name), from: :project_decidim_category_id
+
+      find("*[type=submit]").click
+    end
+
+    within ".flash" do
+      expect(page).to have_content("successfully")
+    end
+
+    within "table" do
+      expect(page).to have_content("My project")
+    end
+  end
+
+  context "deleting a project" do
+    let!(:project2) { create(:project, feature: current_feature) }
+
+    before do
+      visit current_path
+    end
+
+    it "deletes a project" do
+      within find("tr", text: translated(project2.title)) do
+        click_link "Delete"
+      end
+
+      within ".flash" do
+        expect(page).to have_content("successfully")
+      end
+
+      within "table" do
+        expect(page).to_not have_content(translated(project2.title))
+      end
+    end
+  end
+end

data/decidim-budgets/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
+require "decidim/dev/test/base_spec_helper"

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

@@ -33,7 +33,8 @@ module Decidim
         @comment = Comment.create!(author: @author,
                                    commentable: @commentable,
                                    body: form.body,
-                                   alignment: form.alignment)
+                                   alignment: form.alignment,
+                                   decidim_user_group_id: form.user_group_id)
       end
     end
   end

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

@@ -6,6 +6,7 @@ module Decidim
     class CommentForm < Form
       attribute :body, String
       attribute :alignment, Integer
+      attribute :user_group_id, Integer
 
       mimic :comment
 

data/decidim-comments/app/frontend/application/apollo_client.js

@@ -2,7 +2,7 @@ import ApolloClient, { createNetworkInterface } from 'apollo-client';
 
 // Create a custom network interface for Apollo since our
 // API endpoint is not the default.
-const networkInterface = createNetworkInterface({ 
+const networkInterface = createNetworkInterface({
   uri: '/api',
   opts: {
     credentials: 'same-origin'

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

@@ -16,7 +16,7 @@ export default class Application extends Component {
 
     I18n.setLocale(locale);
     moment.locale(locale);
-    
+
     super(props);
   }
 

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

@@ -14,6 +14,7 @@ import commentFragment          from './comment.fragment.graphql';
 import commentDataFragment      from './comment_data.fragment.graphql';
 import upVoteFragment           from './up_vote.fragment.graphql';
 import downVoteFragment         from './down_vote.fragment.graphql';
+import addCommentFormFragment   from './add_comment_form.fragment.graphql';
 
 /**
  * Renders a form to create new comments.
@@ -33,20 +34,23 @@ export class AddCommentForm extends Component {
   render() {
     const { submitButtonClassName, commentableType, commentableId } = this.props;
     const { disabled } = this.state;
-    
+
     return (
       <div className="add-comment">
         {this._renderHeading()}
         {this._renderOpinionButtons()}
         <form onSubmit={(evt) => this._addComment(evt)}>
-          <label className="show-for-sr" htmlFor={`add-comment-${commentableType}-${commentableId}`}>{ I18n.t("components.add_comment_form.form.body.label") }</label>
-          {this._renderTextArea()}
-          <input 
-            type="submit"
-            className={submitButtonClassName}
-            value={I18n.t("components.add_comment_form.form.submit")}
-            disabled={disabled}
-          />
+          {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()}
+            <input
+              type="submit"
+              className={submitButtonClassName}
+              value={I18n.t("components.add_comment_form.form.submit")}
+              disabled={disabled}
+            />
+          </div>
         </form>
       </div>
     );
@@ -94,7 +98,7 @@ export class AddCommentForm extends Component {
       <textarea {...textAreaProps} />
     );
   }
-       
+
   /**
    * Render opinion buttons or not based on the arguable prop
    * @private
@@ -117,7 +121,7 @@ export class AddCommentForm extends Component {
     if (arguable) {
       return (
         <div className="opinion-toggle button-group">
-          <button 
+          <button
             className={okButtonClassName}
             onClick={() => this.setState({ alignment: 1 })}
           >
@@ -143,7 +147,40 @@ export class AddCommentForm extends Component {
 
     return null;
   }
- 
+
+  /**
+   * Render a select with an option for each user's verified group
+   * @private
+   * @returns {Void|DOMElement} - Returns nothing or a form field.
+   */
+  _renderCommentAs() {
+    const { session, commentableType, commentableId } = this.props;
+    const { user, verifiedUserGroups } = session;
+
+    if (verifiedUserGroups.length > 0) {
+      return (
+        <div className="field">
+          <label htmlFor={`add-comment-${commentableType}-${commentableId}-user-group-id`}>
+            { I18n.t('components.add_comment_form.form.user_group_id.label') }
+          </label>
+          <select
+            ref={(select) => {this.userGroupIdSelect = select}}
+            id={`add-comment-${commentableType}-${commentableId}-user-group-id`}
+          >
+            <option value="">{ user.name }</option>
+            {
+              verifiedUserGroups.map((userGroup) => (
+                <option key={userGroup.id} value={userGroup.id}>{userGroup.name}</option>
+              ))
+            }
+          </select>
+        </div>
+      );
+    }
+
+    return null;
+  }
+
   /**
    * Check comment's body and disable form if it's empty
    * @private
@@ -164,10 +201,15 @@ export class AddCommentForm extends Component {
   _addComment(evt) {
     const { alignment } = this.state;
     const { addComment, onCommentAdded } = this.props;
+    let addCommentParams = { body: this.bodyTextArea.value, alignment };
 
     evt.preventDefault();
 
-    addComment({ body: this.bodyTextArea.value, alignment });
+    if (this.userGroupIdSelect && this.userGroupIdSelect.value !== '') {
+      addCommentParams.userGroupId = this.userGroupIdSelect.value;
+    }
+
+    addComment(addCommentParams);
 
     this.bodyTextArea.value = '';
     this.setState({ alignment: 0 });
@@ -185,8 +227,15 @@ AddCommentForm.defaultProps = {
 
 AddCommentForm.propTypes = {
   addComment: PropTypes.func.isRequired,
-  currentUser: PropTypes.shape({
-    name: PropTypes.string.isRequired
+  session: PropTypes.shape({
+    user: PropTypes.shape({
+      name: PropTypes.string.isRequired
+    }),
+    verifiedUserGroups: PropTypes.arrayOf(
+      PropTypes.shape({
+        name: PropTypes.string.isRequired
+      })
+    ).isRequired
   }).isRequired,
   commentableId: PropTypes.string.isRequired,
   commentableType: PropTypes.string.isRequired,
@@ -197,6 +246,12 @@ AddCommentForm.propTypes = {
   autoFocus: PropTypes.bool
 };
 
+AddCommentForm.fragments = {
+  user: gql`
+    ${addCommentFormFragment}
+  `
+};
+
 const AddCommentFormWithMutation = graphql(gql`
   ${addCommentMutation}
   ${commentThreadFragment}
@@ -206,12 +261,13 @@ const AddCommentFormWithMutation = graphql(gql`
   ${downVoteFragment}
 `, {
   props: ({ ownProps, mutate }) => ({
-    addComment: ({ body, alignment }) => mutate({ 
-      variables: { 
+    addComment: ({ body, alignment, userGroupId }) => mutate({
+      variables: {
         commentableId: ownProps.commentableId,
         commentableType: ownProps.commentableType,
         body,
-        alignment
+        alignment,
+        userGroupId
       },
       optimisticResponse: {
         __typename: 'Mutation',
@@ -223,8 +279,8 @@ const AddCommentFormWithMutation = graphql(gql`
           alignment: alignment,
           author: {
             __typename: 'Author',
-            name: ownProps.currentUser.name,
-            avatarUrl: ownProps.currentUser.avatarUrl
+            name: ownProps.session.user.name,
+            avatarUrl: ownProps.session.user.avatarUrl
           },
           replies: [],
           hasReplies: false,