decidim 0.0.1 → 0.0.2

data/decidim-admin/config/routes.rb

@@ -32,6 +32,17 @@ Decidim::Admin::Engine.routes.draw do
 
     resources :static_pages
     resources :scopes, except: [:show]
+    resources :users, except: [:edit, :update], controller: "users" do
+      member do
+        post :resend_invitation, to: "users#resend_invitation"
+      end
+    end
+
+    resources :user_groups, only: [:index] do
+      member do
+        put :verify
+      end
+    end
 
     root to: "dashboard#show"
   end

data/decidim-admin/decidim-admin.gemspec

@@ -19,11 +19,10 @@ Gem::Specification.new do |s|
   s.add_dependency "devise-i18n", "~> 1.1.0"
   s.add_dependency "rectify", "~> 0.8.0"
   s.add_dependency "devise_invitable", "~> 1.7.0"
-  s.add_dependency "foundation-rails", "~> 6.2.4.0"
   s.add_dependency "sassc-rails", "~> 1.3.0"
-  s.add_dependency "jquery-rails", "~> 4.0"
+  s.add_dependency "jquery-rails", "~> 4.2.2"
   s.add_dependency "turbolinks", *Decidim.rails_version
-  s.add_dependency "foundation_rails_helper", "~> 2.0.0"
+  s.add_dependency "foundation_rails_helper", "~> 3.0.0.rc"
   s.add_dependency "active_link_to", "~> 1.0.0"
   s.add_dependency "carrierwave", "~> 1.0.0.rc"
   s.add_dependency "cancancan", "~> 1.15.0"

data/decidim-admin/lib/decidim/admin/features/base_controller.rb

@@ -8,14 +8,18 @@ module Decidim
         skip_authorize_resource
         include Concerns::ParticipatoryProcessAdmin
         include NeedsParticipatoryProcess
-        helper_method :current_feature, :current_participatory_process, :parent_path
+        include FeatureSettings
+
+        helper_method :current_feature,
+                      :current_participatory_process,
+                      :parent_path
+
+        delegate :active_step, to: :current_participatory_process, prefix: false
 
         before_action do
           authorize! :manage, current_feature
         end
 
-        private
-
         def current_feature
           request.env["decidim.current_feature"]
         end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+FactoryGirl.define do
+  factory :participatory_process_user_role, class: Decidim::Admin::ParticipatoryProcessUserRole do
+    user
+    participatory_process
+    role "admin"
+  end
+end

data/decidim-admin/spec/commands/create_category_spec.rb

@@ -22,8 +22,9 @@ module Decidim
         let(:form) do
           CategoryForm.from_params(
             form_params,
-            current_organization: organization,
             current_process: participatory_process
+          ).with_context(
+            current_organization: organization,
           )
         end
         let(:command) { described_class.new(form, participatory_process) }

data/decidim-admin/spec/commands/create_feature_spec.rb

@@ -12,11 +12,22 @@ module Decidim
             es: "Mi funcionalidad"
           },
           invalid?: !valid,
-          valid?: valid
+          valid?: valid,
+          settings: {
+            dummy_global_attribute_1: true,
+            dummy_global_attribute_2: false
+          },
+          step_settings: {
+            step.id.to_s => {
+              dummy_step_attribute_1: true,
+              dummy_step_attribute_2: false
+            }
+          }
         )
       end
 
-      let(:participatory_process) { create(:participatory_process) }
+      let(:participatory_process) { create(:participatory_process, :with_steps) }
+      let(:step) { participatory_process.steps.first }
 
       describe "when valid" do
         let(:valid) { true }
@@ -27,6 +38,14 @@ module Decidim
           }.to broadcast(:ok)
 
           expect(participatory_process.features).to_not be_empty
+
+          feature = participatory_process.features.first
+          expect(feature.settings.dummy_global_attribute_1).to eq(true)
+          expect(feature.settings.dummy_global_attribute_2).to eq(false)
+
+          step_settings = feature.step_settings[step.id.to_s]
+          expect(step_settings.dummy_step_attribute_1).to eq(true)
+          expect(step_settings.dummy_step_attribute_2).to eq(false)
         end
 
         it "fires the hooks" do

data/decidim-admin/spec/commands/create_participatory_process_spec.rb

@@ -30,8 +30,20 @@ describe Decidim::Admin::CreateParticipatoryProcess do
   end
 
   context "when everything is ok" do
-    it "creates the user role" do
+    it "creates a participatory process" do
       expect { subject.call }.to change { Decidim::ParticipatoryProcess.count }.by(1)
     end
+
+    it "broadcasts ok" do
+      expect { subject.call }.to broadcast(:ok)
+    end
+
+    it "adds the default step" do
+      subject.call do
+        on(:ok) do |process|
+          expect(process.steps.count).to eq(1)
+        end
+      end
+    end
   end
 end

data/decidim-admin/spec/commands/create_static_page_spec.rb

@@ -6,7 +6,7 @@ module Decidim
     describe CreateStaticPage, :db do
       describe "call" do
         let(:organization) { create(:organization) }
-        let(:form) { StaticPageForm.from_model(build(:static_page, organization: organization)) }
+        let(:form) { StaticPageForm.from_model(build(:static_page)).with_context(current_organization: organization) }
         let(:command) { described_class.new(form) }
 
         describe "when the form is not valid" do

data/decidim-admin/spec/commands/destroy_participatory_process_step_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+
+describe Decidim::Admin::DestroyParticipatoryProcessStep, class: true do
+  let(:subject) { described_class }
+
+  let!(:participatory_process) { create(:participatory_process) }
+
+  let!(:active_step) do
+    create(:participatory_process_step, participatory_process: participatory_process, active: true)
+  end
+
+  context "when there's more than one step" do
+    let!(:inactive_step) do
+      create(:participatory_process_step, participatory_process: participatory_process, active: false)
+    end
+
+    context "when destroying the active step" do
+      it "broadcasts invalid" do
+        expect { subject.call(active_step) }.to broadcast(:invalid, :active_step)
+      end
+
+      it "doesn't destroy the step" do
+        subject.call(active_step)
+        expect(active_step).to be_persisted
+      end
+    end
+
+    context "when destroying an inactive step" do
+      it "broadcasts ok" do
+        expect { subject.call(inactive_step) }.to broadcast(:ok)
+      end
+
+      it "destroys the step" do
+        subject.call(inactive_step)
+        expect(inactive_step).to_not be_persisted
+      end
+    end
+  end
+
+  context "when trying to destroy the last step" do
+    it "broadcasts invalid" do
+      expect { subject.call(active_step) }.to broadcast(:invalid, :last_step)
+    end
+  end
+end

data/decidim-admin/spec/commands/update_category_spec.rb

@@ -23,8 +23,9 @@ module Decidim
         let(:form) do
           CategoryForm.from_params(
             form_params,
-            current_organization: organization,
             current_process: participatory_process
+          ).with_context(
+            current_organization: organization
           )
         end
         let(:command) { described_class.new(category, form) }

data/decidim-admin/spec/commands/update_feature_spec.rb

@@ -0,0 +1,79 @@
+require "spec_helper"
+
+module Decidim
+  module Admin
+    describe UpdateFeature do
+      let!(:participatory_process) { create(:participatory_process, :with_steps) }
+      let(:step) { participatory_process.steps.first }
+      let!(:feature) { create(:feature, participatory_process: participatory_process) }
+      let(:manifest) { feature.manifest }
+
+      let(:form) do
+        instance_double(FeatureForm,
+          name: {
+            en: "My feature",
+            ca: "La meva funcionalitat",
+            es: "Mi funcionalidad"
+          },
+          invalid?: !valid,
+          valid?: valid,
+          settings: {
+            dummy_global_attribute_1: true,
+            dummy_global_attribute_2: false
+          },
+          step_settings: {
+            step.id.to_s => {
+              dummy_step_attribute_1: true,
+              dummy_step_attribute_2: false
+            }
+          }
+        )
+      end
+
+      describe "when valid" do
+        let(:valid) { true }
+
+        it "broadcasts :ok and updates the feature" do
+          expect {
+            described_class.call(form, feature)
+          }.to broadcast(:ok)
+
+          expect(feature["name"]["en"]).to eq("My feature")
+          expect(feature.settings.dummy_global_attribute_1).to eq(true)
+          expect(feature.settings.dummy_global_attribute_2).to eq(false)
+
+          step_settings = feature.step_settings[step.id.to_s]
+          expect(step_settings.dummy_step_attribute_1).to eq(true)
+          expect(step_settings.dummy_step_attribute_2).to eq(false)
+        end
+
+        it "fires the hooks" do
+          results = {}
+
+          manifest.on(:update) do |feature|
+            results[:feature] = feature
+          end
+
+          described_class.call(form, feature)
+
+          feature = results[:feature]
+          expect(feature.name["en"]).to eq("My feature")
+          expect(feature).to be_persisted
+        end
+      end
+
+      describe "when invalid" do
+        let(:valid) { false }
+
+        it "creates the feature" do
+          expect {
+            described_class.call(form, feature)
+          }.to broadcast(:invalid)
+
+          feature.reload
+          expect(feature.name["en"]).to_not eq("My feature")
+        end
+      end
+    end
+  end
+end

data/decidim-admin/spec/commands/update_organization_spec.rb

@@ -17,7 +17,8 @@ module Decidim
               welcome_text_ca: "Hola",
               description_en: "My description",
               description_es: "Mi descripción",
-              description_ca: "La meva descripció"
+              description_ca: "La meva descripció",
+              show_statistics: false
             }
           }
         end
@@ -25,7 +26,7 @@ module Decidim
           { current_organization: organization }
         end
         let(:form) do
-          OrganizationForm.from_params(params, context)
+          OrganizationForm.from_params(params).with_context(context)
         end
         let(:command) { described_class.new(organization, form) }
 

data/decidim-admin/spec/commands/update_static_page_spec.rb

@@ -9,8 +9,9 @@ module Decidim
         let(:page) { create(:static_page, organization: organization) }
         let(:form) do
           StaticPageForm.from_params(
-            static_page: page.attributes.merge(slug: "new-slug"),
-            organization: page.organization
+            static_page: page.attributes.merge(slug: "new-slug")
+          ).with_context(
+            current_organization: page.organization
           )
         end
         let(:command) { described_class.new(page, form) }

data/decidim-admin/spec/factories.rb

@@ -1,9 +1,2 @@
-require_relative "../../decidim-core/spec/factories"
-
-FactoryGirl.define do
-  factory :participatory_process_user_role, class: Decidim::Admin::ParticipatoryProcessUserRole do
-    user
-    participatory_process
-    role "admin"
-  end
-end
+require "decidim/core/test/factories"
+require "decidim/admin/test/factories"

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

@@ -6,8 +6,8 @@ describe "Admin manages features", type: :feature do
   let(:organization) { create(:organization) }
   let(:user) { create(:user, :admin, :confirmed, organization: organization) }
 
-  let(:participatory_process) do
-    create(:participatory_process, organization: organization)
+  let!(:participatory_process) do
+    create(:participatory_process, :with_steps, organization: organization)
   end
 
   before do
@@ -36,6 +36,14 @@ describe "Admin manages features", type: :feature do
           es: "Mi funcionalitat"
         )
 
+        within ".global-settings" do
+          all("input[type=checkbox]").last.click
+        end
+
+        within ".step-settings" do
+          all("input[type=checkbox]").first.click
+        end
+
         find("*[type=submit]").click
       end
 
@@ -44,6 +52,80 @@ describe "Admin manages features", type: :feature do
       end
 
       expect(page).to have_content("My feature")
+
+      within find("tr", text: "My feature") do
+        click_link "Configure"
+      end
+
+      within ".global-settings" do
+        expect(all("input[type=checkbox]").last).to be_checked
+      end
+
+      within ".step-settings" do
+        expect(all("input[type=checkbox]").first).to be_checked
+      end
+    end
+  end
+
+  describe "edit a feature" do
+    let(:feature_name) do
+      {
+        en: "My feature",
+        ca: "La meva funcionalitat",
+        es: "Mi funcionalitat"
+      }
+    end
+
+    let!(:feature) do
+      create(:feature, name: feature_name, participatory_process: participatory_process)
+    end
+
+    before do
+      visit decidim_admin.participatory_process_features_path(participatory_process)
+    end
+
+    it "updates the feature" do
+      within ".feature-#{feature.id}" do
+        click_link "Configure"
+      end
+
+      within ".edit_feature" do
+        fill_in_i18n(
+          :feature_name,
+          "#name-tabs",
+          en: "My updated feature",
+          ca: "La meva funcionalitat actualitzada",
+          es: "Mi funcionalidad actualizada"
+        )
+
+        within ".global-settings" do
+          all("input[type=checkbox]").last.click
+        end
+
+        within ".step-settings" do
+          all("input[type=checkbox]").first.click
+        end
+
+        find("*[type=submit]").click
+      end
+
+      within_flash_messages do
+        expect(page).to have_content("successfully")
+      end
+
+      expect(page).to have_content("My updated feature")
+
+      within find("tr", text: "My updated feature") do
+        click_link "Configure"
+      end
+
+      within ".global-settings" do
+        expect(all("input[type=checkbox]").last).to be_checked
+      end
+
+      within ".step-settings" do
+        expect(all("input[type=checkbox]").first).to be_checked
+      end
     end
   end
 

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

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe "Organization admins", type: :feature do
+  include ActionView::Helpers::SanitizeHelper
+
+  let(:admin) { create :user, :admin, :confirmed }
+  let(:organization) { admin.organization }
+
+  before do
+    switch_to_host(organization.host)
+  end
+
+  describe "Managing users" do
+    before do
+      login_as admin, scope: :user
+      visit decidim_admin.root_path
+      click_link "Admin users"
+    end
+
+    it "can invite new users" do
+      find(".actions .new").click
+
+      within ".new_user" do
+        fill_in :user_name, with: "New admin"
+        fill_in :user_email, with: "newadmin@decidim.org"
+
+        find("*[type=submit]").click
+      end
+
+      within ".flash" do
+        expect(page).to have_content("successfully")
+      end
+
+      within "table" do
+        expect(page).to have_content("New admin")
+      end
+    end
+
+    context "with existing users" do
+      let!(:user) do
+        user = build(:user, :confirmed, :admin, organization: organization)
+        user.invite!
+        user
+      end
+      let!(:other_admin) { create(:user, :confirmed, :admin, organization: organization) }
+
+      before do
+        visit current_path
+      end
+
+      it "can resend the invitation" do
+        within "tr[data-user-id=\"#{user.id}\"]" do
+          click_link "Resend invitation"
+        end
+
+        expect(page).to have_content("Invitation email sent successfully")
+      end
+
+      it "can remove the admin rights" do
+        expect(page).to have_content(other_admin.name)
+
+        within "tr[data-user-id=\"#{other_admin.id}\"]" do
+          click_link "Destroy"
+        end
+
+        expect(page).to_not have_content(other_admin.name)
+      end
+    end
+  end
+end