decidim 0.0.1 → 0.0.2

data/decidim-admin/spec/features/admin_manages_user_groups_spec.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
+require "spec_helper"
+require_relative "../shared/participatory_admin_shared_context"
+
+describe "Admin manage user groups", type: :feature do
+  include_context "participatory process admin"
+  let!(:user_groups) { create_list(:user_group_membership, 10, user: create(:user, organization: organization)) }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin.user_groups_path
+  end
+
+  it "verify a user group" do
+    click_button "Verify", match: :first
+
+    expect(page).not_to have_selector(".actions button", match: :first)
+    
+    expect(page).to have_content("verified successfully")
+  end
+end

data/decidim-admin/spec/forms/category_form_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 require "spec_helper"
 
@@ -37,7 +38,8 @@ module Decidim
 
       subject do
         described_class.from_params(
-          attributes,
+          attributes
+        ).with_context(
           current_process: participatory_process,
           current_organization: organization
         )
@@ -47,12 +49,6 @@ module Decidim
         it { is_expected.to be_valid }
       end
 
-      context "when participatory process is not set" do
-        let(:participatory_process) { nil }
-
-        it { is_expected.not_to be_valid }
-      end
-
       context "when some language in name is missing" do
         let(:name) do
           {

data/decidim-admin/spec/forms/organization_form_spec.rb

@@ -6,6 +6,7 @@ module Decidim
   module Admin
     describe OrganizationForm do
       let(:name) { "My super organization" }
+      let(:twitter_handler) { "My awesome handler" }
       let(:welcome_text) do
         {
           en: "Welcome",
@@ -33,7 +34,8 @@ module Decidim
             "description_en" => description[:en],
             "description_es" => description[:es],
             "description_ca" => description[:ca],
-            "homepage_image" => Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", "city.jpeg"), "image/jpeg")
+            "homepage_image" => Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", "city.jpeg"), "image/jpeg"),
+            "show_statics" => false
           }
         }
       end
@@ -44,7 +46,11 @@ module Decidim
         }
       end
 
-      subject { described_class.from_params(attributes, context) }
+      subject do
+        described_class.from_params(attributes).with_context(
+          context
+        )
+      end
 
       context "when everything is OK" do
         it { is_expected.to be_valid }

data/decidim-admin/spec/forms/participatory_process_form_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 require "spec_helper"
 
@@ -54,7 +55,7 @@ module Decidim
         }
       end
 
-      subject { described_class.from_params(attributes, current_organization: organization) }
+      subject { described_class.from_params(attributes).with_context(current_organization: organization) }
 
       context "when everything is OK" do
         it { is_expected.to be_valid }

data/decidim-admin/spec/forms/participatory_process_step_form_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 require "spec_helper"
 
@@ -46,7 +47,7 @@ module Decidim
       end
       let(:organization) { build(:organization) }
 
-      subject { described_class.from_params(attributes, current_organization: organization) }
+      subject { described_class.from_params(attributes).with_context(current_organization: organization) }
 
       describe "dates" do
         context "when the dates are set" do
@@ -82,26 +83,6 @@ module Decidim
         it { is_expected.to be_invalid }
       end
 
-      context "when some language in description is missing" do
-        let(:description) do
-          {
-            ca: "Descripció"
-          }
-        end
-
-        it { is_expected.to be_invalid }
-      end
-
-      context "when some language in short_description is missing" do
-        let(:short_description) do
-          {
-            en: "Short description"
-          }
-        end
-
-        it { is_expected.to be_invalid }
-      end
-
       context "when the start_date is later than end_date" do
         let(:start_date) { 1.month.from_now }
         let(:end_date) { 2.months.ago }

data/decidim-admin/spec/forms/scope_form_spec.rb

@@ -19,7 +19,7 @@ module Decidim
         }
       end
 
-      subject { described_class.from_params(attributes, context) }
+      subject { described_class.from_params(attributes).with_context(context) }
 
       context "when everything is OK" do
         it { is_expected.to be_valid }

data/decidim-admin/spec/forms/static_page_form_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 require "spec_helper"
 
@@ -35,7 +36,7 @@ module Decidim
         }
       end
 
-      subject { described_class.from_params(attributes) }
+      subject { described_class.from_params(attributes).with_context(current_organization: organization) }
 
       context "when everything is OK" do
         it { is_expected.to be_valid }
@@ -68,12 +69,6 @@ module Decidim
         it { is_expected.to be_invalid }
       end
 
-      context "when organization is missing" do
-        let(:organization) { nil }
-
-        it { is_expected.to be_invalid }
-      end
-
       context "when slug is not unique" do
         before do
           create(:static_page, organization: organization, slug: slug)

data/decidim-admin/spec/models/abilities/admin_user_spec.rb

@@ -26,6 +26,15 @@ describe Decidim::Admin::Abilities::AdminUser do
   it { is_expected.to be_able_to(:new, Decidim::StaticPage) }
   it { is_expected.to be_able_to(:read, Decidim::StaticPage) }
 
+  it { is_expected.to be_able_to(:create, Decidim::User) }
+  it { is_expected.to be_able_to(:index, Decidim::User) }
+  it { is_expected.to be_able_to(:new, Decidim::User) }
+  it { is_expected.to be_able_to(:read, Decidim::User) }
+  it { is_expected.to be_able_to(:invite, Decidim::User) }
+
+  it { is_expected.to be_able_to(:index, Decidim::UserGroup) }  
+  it { is_expected.to be_able_to(:verify, Decidim::UserGroup) }  
+
   context "when a page is a default one" do
     let(:page) { build(:static_page, :default) }
     let(:form) { Decidim::Admin::StaticPageForm.new(slug: page.slug) }
@@ -59,4 +68,17 @@ describe Decidim::Admin::Abilities::AdminUser do
     it { is_expected.not_to be_able_to(:update, organization) }
     it { is_expected.not_to be_able_to(:read, organization) }
   end
+
+  context "when destroying a user" do
+    context "when the user is themselves" do
+      let(:user_to_destroy) { user }
+      it { is_expected.not_to be_able_to(:destroy, user_to_destroy) }
+    end
+
+    context "when it is another user" do
+      let(:user_to_destroy) { build(:user) }
+
+      it { is_expected.to be_able_to(:destroy, user_to_destroy) }
+    end
+  end
 end

data/decidim-admin/spec/shared/manage_process_attachments_examples.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # frozen_string_literal: true
 RSpec.shared_examples "manage process attachments examples" do
   let!(:attachment) do
@@ -42,7 +43,7 @@ RSpec.shared_examples "manage process attachments examples" do
         ca: "Document Molt Important"
       )
 
-      fill_in_i18n_editor(
+      fill_in_i18n(
         :participatory_process_attachment_description,
         "#description-tabs",
         en: "This document contains important information",

data/decidim-admin/spec/shared/manage_process_steps_examples.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 RSpec.shared_examples "manage process steps examples" do
   let(:active) { false }
@@ -132,21 +133,7 @@ RSpec.shared_examples "manage process steps examples" do
       end
 
       within find("tr", text: translated(process_step.title)) do
-        expect(page).to have_content("Deactivate")
-      end
-    end
-  end
-
-  context "deactivating a step" do
-    let(:active) { true }
-
-    it "deactivates a step" do
-      within find("tr", text: translated(process_step.title)) do
-        click_link "Deactivate"
-      end
-
-      within find("tr", text: translated(process_step.title)) do
-        expect(page).to have_content("Activate")
+        expect(page).to have_no_content("Activate")
       end
     end
   end

data/decidim-admin/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
-require "decidim/test/base_spec_helper"
+
+require "decidim/dev/test/base_spec_helper"
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.include ProcessesMenuLinksHelpers

data/decidim-api/Rakefile

@@ -1,2 +1,2 @@
 # frozen_string_literal: true
-require "decidim/common_rake"
+require "decidim/dev/common_rake"

data/decidim-api/decidim-api.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
   s.summary     = "API engine for decidim"
   s.description = "API engine for decidim"
 
-  s.files = Dir["{app,config,db,lib}/**/*", "LICENSE.txt", "Rakefile", "README.md"]
+  s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.txt", "Rakefile", "README.md"]
 
   s.add_dependency "rails", *Decidim.rails_version
-  s.add_dependency "graphql", "~> 1.3.0"
-  s.add_dependency "graphiql-rails", "~> 1.4.0"
+  s.add_dependency "graphql", "~> 1.4.1"
+  s.add_dependency "graphiql-rails", "~> 1.4.1"
   s.add_dependency "rack-cors", "~> 0.4.0"
   s.add_dependency "sprockets-es6", "~> 0.9.2"
 

data/decidim-api/spec/factories.rb

@@ -1,2 +1,2 @@
-require_relative "../../decidim-core/spec/factories"
-require_relative "../../decidim-comments/spec/factories"
+require "decidim/core/test/factories"
+require "decidim/comments/test/factories"

data/decidim-api/spec/spec_helper.rb

@@ -1,2 +1,4 @@
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
-require "decidim/test/base_spec_helper"
+
+require "decidim/dev/test/base_spec_helper"
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/decidim-comments/Rakefile

@@ -1,2 +1,2 @@
 # frozen_string_literal: true
-require "decidim/common_rake"
+require "decidim/dev/common_rake"

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+module Decidim
+  module Comments
+    # A command with all the business logic to upvote a comment
+    class VoteComment < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # comment - A comment
+      # author - A user
+      # options - An optional hash of options (default: { weight: 1 })
+      #         * weight: The vote's weight. Valid values 1 and -1.
+      def initialize(comment, author, options = { weight: 1 })
+        @comment = comment
+        @author = author
+        @weight = options[:weight]
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the vote wasn't create
+      #
+      # Returns nothing.
+      def call
+        if @weight == 1
+          @comment.up_votes.create!(author: @author)
+        elsif @weight == -1
+          @comment.down_votes.create!(author: @author)
+        else
+          return broadcast(:invalid)
+        end
+        broadcast(:ok, @comment)
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+        broadcast(:invalid)
+      end
+    end
+  end
+end

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

@@ -2,20 +2,25 @@ import { PropTypes } from 'react';
 
 import assetUrl      from '../support/asset_url';
 
-const Icon = ({ name }) => {
+const Icon = ({ name, iconExtraClassName }) => {
   if (navigator.userAgent.match(/PhantomJS/)) {
-    return <span>{name}</span>;
+    return <span className={`icon ${iconExtraClassName} ${name}`}>{name}</span>;
   }
 
   return (
-    <svg className={`icon icon--before ${name}`}>
+    <svg className={`icon ${iconExtraClassName} ${name}`}>
       <use xmlnsXlink="http://www.w3.org/1999/xlink" xlinkHref={`${assetUrl('icons.svg')}#${name}`} />
     </svg>  
   );
 };
 
+Icon.defaultProps = {
+  iconExtraClassName: 'icon--before'
+};
+
 Icon.propTypes = {
-  name: PropTypes.string.isRequired
+  name: PropTypes.string.isRequired,
+  iconExtraClassName: PropTypes.string.isRequired
 };
 
 export default Icon;

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

@@ -1,6 +1,6 @@
-import { shallow } from 'enzyme';
+import { shallow, mount } from 'enzyme';
 
-import Icon        from './icon.component';
+import Icon               from './icon.component';
 
 describe("<Icon /", () => {
   beforeEach(() => {
@@ -40,4 +40,14 @@ describe("<Icon /", () => {
     const wrapper = shallow(<Icon name="icon-thumb-up" />);
     expect(wrapper.find('span')).to.have.text('icon-thumb-up');
   });
+
+  it("should have a default prop iconExtraClassName with value 'icon--before'", () => {
+    const wrapper = mount(<Icon name="icon-thumb-up" />);
+    expect(wrapper).to.have.prop('iconExtraClassName').equal('icon--before');    
+  });
+
+  it("should render the svg with an extra class defined by iconExtraClassName", () => {
+    const wrapper = mount(<Icon name="icon-thumb-up" iconExtraClassName="icon--small" />);
+    expect(wrapper.find('.icon--small')).to.be.present();
+  });
 });

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

@@ -4,13 +4,16 @@ import { graphql }              from 'react-apollo';
 import gql                      from 'graphql-tag';
 import { I18n }                 from 'react-i18nify';
 import uuid                     from 'uuid';
-import moment                   from 'moment';
 import classnames               from 'classnames';
 
 import Icon                     from '../application/icon.component';
 
 import addCommentMutation       from './add_comment_form.mutation.graphql';
+import commentThreadFragment    from './comment_thread.fragment.graphql'
+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';
 
 /**
  * Renders a form to create new comments.
@@ -37,13 +40,7 @@ export class AddCommentForm extends Component {
         {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>
-          <textarea
-            ref={(textarea) => this.bodyTextArea = textarea}
-            id={`add-comment-${commentableType}-${commentableId}`}
-            rows="4"
-            placeholder={I18n.t("components.add_comment_form.form.body.placeholder")}
-            onChange={(evt) => this._checkCommentBody(evt.target.value)}
-          />
+          {this._renderTextArea()}
           <input 
             type="submit"
             className={submitButtonClassName}
@@ -74,6 +71,30 @@ export class AddCommentForm extends Component {
     return null;
   }
 
+  /**
+   * Render the form heading based on showTitle prop
+   * @private
+   * @returns {Void|DOMElement} - The heading or an empty element
+   */
+  _renderTextArea() {
+    const { commentableType, commentableId, autoFocus} = this.props;
+
+    let textAreaProps = {
+      ref: (textarea) => {this.bodyTextArea = textarea},
+      id: `add-comment-${commentableType}-${commentableId}`,
+      rows: "4",
+      placeholder: I18n.t("components.add_comment_form.form.body.placeholder"),
+      onChange: (evt) => this._checkCommentBody(evt.target.value)
+    };
+    if (autoFocus) {
+      textAreaProps.autoFocus = 'autoFocus';
+    }
+
+    return (
+      <textarea {...textAreaProps} />
+    );
+  }
+       
   /**
    * Render opinion buttons or not based on the arguable prop
    * @private
@@ -172,12 +193,17 @@ AddCommentForm.propTypes = {
   showTitle: PropTypes.bool.isRequired,
   submitButtonClassName: PropTypes.string.isRequired,
   onCommentAdded: PropTypes.func,
-  arguable: PropTypes.bool
+  arguable: PropTypes.bool,
+  autoFocus: PropTypes.bool
 };
 
 const AddCommentFormWithMutation = graphql(gql`
   ${addCommentMutation}
+  ${commentThreadFragment}
+  ${commentFragment}
   ${commentDataFragment}
+  ${upVoteFragment}
+  ${downVoteFragment}
 `, {
   props: ({ ownProps, mutate }) => ({
     addComment: ({ body, alignment }) => mutate({ 
@@ -192,7 +218,7 @@ const AddCommentFormWithMutation = graphql(gql`
         addComment: {
           __typename: 'Comment',
           id: uuid(),
-          createdAt: moment().format("YYYY-MM-DD HH:mm:ss z"),
+          createdAt: new Date().toISOString(),
           body,
           alignment: alignment,
           author: {
@@ -201,7 +227,12 @@ const AddCommentFormWithMutation = graphql(gql`
             avatarUrl: ownProps.currentUser.avatarUrl
           },
           replies: [],
-          canHaveReplies: false
+          hasReplies: false,
+          canHaveReplies: false,
+          upVotes: 0,
+          upVoted: false,
+          downVotes: 0,
+          downVoted: false
         }
       },
       updateQueries: {
@@ -216,6 +247,7 @@ const AddCommentFormWithMutation = graphql(gql`
             if (comment.id === commentableId) {
               return {
                 ...comment,
+                hasReplies: true,
                 replies: [
                   ...replies,
                   newComment