decidim 0.0.5 → 0.0.6

data/decidim-admin/config/routes.rb

@@ -2,6 +2,7 @@
 Decidim::Admin::Engine.routes.draw do
   constraints(->(request) { Decidim::Admin::OrganizationDashboardConstraint.new(request).matches? }) do
     resource :organization, only: [:edit, :update], controller: "organization"
+    resources :participatory_process_groups
     resources :participatory_processes do
       resource :publish, controller: "participatory_process_publications", only: [:create, :destroy]
 
@@ -23,6 +24,13 @@ Decidim::Admin::Engine.routes.draw do
           put :unpublish
         end
       end
+
+      resources :moderations do
+        member do
+          put :unreport
+          put :hide
+        end
+      end
     end
 
     scope "/participatory_processes/:participatory_process_id/features/:feature_id/manage" do

data/decidim-admin/db/seeds.rb

@@ -4,7 +4,7 @@ if !Rails.env.production? || ENV["SEED"]
 
   process_admin = Decidim::User.create!(
     name: "Process Admin",
-    email: "process_admin@decidim.org",
+    email: "process_admin@example.org",
     password: "decidim123456",
     password_confirmation: "decidim123456",
     confirmed_at: Time.current,

data/decidim-admin/lib/decidim/admin/engine.rb

@@ -9,6 +9,7 @@ require "jquery-rails"
 require "sassc-rails"
 require "foundation-rails"
 require "foundation_rails_helper"
+require "autoprefixer-rails"
 require "rectify"
 
 require_dependency File.join(File.dirname(__FILE__), "..", "..", "..", "app/models/decidim/admin/abilities/admin_user")

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

@@ -3,16 +3,21 @@ require "spec_helper"
 describe Decidim::Admin::CreateParticipatoryProcessAdmin do
   let(:my_process) { create :participatory_process }
   let!(:email) { "my_email@example.org" }
+  let!(:role) { "admin" }
+  let!(:name) { "Weird Guy" }
   let!(:user) { create :user, email: "my_email@example.org", organization: my_process.organization }
+  let!(:current_user) { create :user, email: "some_email@example.org", organization: my_process.organization }
   let(:form) do
     double(
       :invalid? => invalid,
-      email: email
+      email: email,
+      role: role,
+      name: name
     )
   end
   let(:invalid) { false }
 
-  subject { described_class.new(form, my_process) }
+  subject { described_class.new(form, current_user, my_process) }
 
   context "when to form is not valid" do
     let(:invalid) { true }
@@ -25,8 +30,9 @@ describe Decidim::Admin::CreateParticipatoryProcessAdmin do
   context "when there is no user with the given email" do
     let(:email) { "does_not_exist@example.com" }
 
-    it "is not valid" do
-      expect { subject.call }.to broadcast(:invalid)
+    it "creates a new user with said email" do
+      subject.call
+      expect(Decidim::User.last.email).to eq(email)
     end
   end
 

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

@@ -2,6 +2,8 @@ require "spec_helper"
 
 describe Decidim::Admin::CreateParticipatoryProcess do
   let(:organization) { create :organization }
+  let(:participatory_process_group) { create :participatory_process_group, organization: organization }
+  let(:scope) { create :scope, organization: organization }
   let(:errors) { double.as_null_object }
   let(:form) do
     double(
@@ -10,13 +12,16 @@ describe Decidim::Admin::CreateParticipatoryProcess do
       subtitle: {en: "subtitle"},
       slug: "slug",
       hashtag: "hashtag",
+      meta_scope: "meta scope",
       hero_image: nil,
       banner_image: nil,
       promoted: nil,
       description: {en: "description"},
       short_description: {en: "short_description"},
       current_organization: organization,
-      errors: errors
+      scope: scope,
+      errors: errors,
+      participatory_process_group: participatory_process_group
     )
   end
   let(:invalid) { false }

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Admin
+    describe HideResource do
+      let(:reportable) { create(:dummy_resource) }
+      let(:moderation) { create(:moderation, reportable: reportable, report_count: 1) }
+      let!(:report) { create(:report, moderation: moderation) }
+      let(:command) { described_class.new(reportable) }
+
+      context "when everything is ok" do
+        it "broadcasts ok" do
+          expect { command.call }.to broadcast(:ok)
+        end
+
+        it "hides the resource" do
+          command.call
+          expect(reportable.reload).to be_hidden
+        end
+      end
+
+      context "when the resource is already hidden" do
+        let(:moderation) { create(:moderation, reportable: reportable, report_count: 1, hidden_at: Time.current) }
+
+        it "broadcasts invalid" do
+          expect { command.call }.to broadcast(:invalid)
+        end
+      end
+
+      context "when the resource is not reported" do
+        let(:moderation) { nil }
+        let!(:report) { nil }
+
+        it "broadcasts invalid" do
+          expect { command.call }.to broadcast(:invalid)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Admin
+    describe UnreportResource do
+      let(:reportable) { create(:dummy_resource) }
+      let(:moderation) { create(:moderation, reportable: reportable, report_count: 1) }
+      let!(:report) { create(:report, moderation: moderation) }
+      let(:command) { described_class.new(reportable) }
+
+      context "when everything is ok" do
+        it "broadcasts ok" do
+          expect { command.call }.to broadcast(:ok)
+        end
+
+        it "resets the report count" do
+          command.call
+          expect(reportable.reload.moderation.report_count).to eq(0)
+        end
+
+        context "when the resource is hidden" do
+          let(:moderation) { create(:moderation, reportable: reportable, report_count: 1, hidden_at: Time.current) }
+
+          it "unhides the resource" do
+            command.call
+            expect(reportable.reload).not_to be_hidden
+          end
+        end
+      end
+
+      context "when the resource is not reported" do
+        let(:moderation) { nil }
+        let!(:report) { nil }
+
+        it "broadcasts invalid" do
+          expect { command.call }.to broadcast(:invalid)
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,7 @@ module Decidim
           {
             organization: {
               name: "My super organization",
+              reference_prefix: "MSO",
               default_locale: "en",
               welcome_text_en: "Welcome",
               welcome_text_es: "Hola",

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

@@ -9,6 +9,7 @@ describe "Admin invite", type: :feature do
   let(:params) do
     {
       name: "Gotham City",
+      reference_prefix: "JKR",
       host: "decide.lvh.me",
       organization_admin_name: "Fiorello Henry La Guardia",
       organization_admin_email: "f.laguardia@gotham.gov",

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

@@ -2,7 +2,7 @@
 require "spec_helper"
 
 describe "manage a feature's permissions", type: :feature do
-  let(:organization) { create(:organization) }
+  let(:organization) { create(:organization, available_authorizations: ["Decidim::DummyAuthorizationHandler"]) }
   let(:user) { create(:user, :admin, :confirmed, organization: organization) }
 
   let!(:participatory_process) do

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

@@ -23,7 +23,7 @@ describe "Organization admins", type: :feature do
 
       within ".new_user" do
         fill_in :user_name, with: "New admin"
-        fill_in :user_email, with: "newadmin@decidim.org"
+        fill_in :user_email, with: "newadmin@example.org"
 
         find("*[type=submit]").click
       end

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

@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin manage participatory process groups", type: :feature do
+  include_context "participatory process admin"
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    @participatory_processes = create_list(:participatory_process, 3, organization: organization)
+    visit decidim_admin.participatory_process_groups_path
+  end
+
+  it "creates a new participatory process group" do
+    find(".actions .new").click
+
+    within ".new_participatory_process_group" do
+      fill_in_i18n(
+        :participatory_process_group_name,
+        "#name-tabs",
+        en: "My group",
+        es: "Mi grupo",
+        ca: "El meu grup"
+      )
+      fill_in_i18n_editor(
+        :participatory_process_group_description,
+        "#description-tabs",
+        en: "A longer description",
+        es: "Descripción más larga",
+        ca: "Descripció més llarga"
+      )
+      select @participatory_processes.first.title["en"], from: :participatory_process_group_participatory_process_ids
+      attach_file :participatory_process_group_hero_image, image1_path
+
+      find("*[type=submit]").click
+    end
+
+    within ".flash" do
+      expect(page).to have_content("successfully")
+    end
+
+    expect(page).to have_content("My group")
+      expect(page).to have_content(@participatory_processes.first.title["en"])
+    expect(page).to have_css("img[src*='#{image1_filename}']")
+  end
+
+  context "with exsiting groups" do
+    let!(:participatory_processes) { create_list(:participatory_process, 3, organization: organization) }
+    let!(:participatory_process_group) { create(:participatory_process_group, organization: organization) }
+
+    before do
+      visit current_path
+    end
+
+    it "can edit them" do
+      within find("tr", text: participatory_process_group.name["en"]) do
+        click_link "Edit"
+      end
+
+      within ".edit_participatory_process_group" do
+        fill_in_i18n(
+          :participatory_process_group_name,
+          "#name-tabs",
+          en: "My old group",
+          es: "Mi grupo antiguo",
+          ca: "El meu grup antic"
+        )
+        fill_in_i18n_editor(
+          :participatory_process_group_description,
+          "#description-tabs",
+          en: "New description",
+          es: "Nueva descripción",
+          ca: "Nova descripció"
+        )
+        select @participatory_processes.last.title["en"], from: :participatory_process_group_participatory_process_ids
+        attach_file :participatory_process_group_hero_image, image2_path
+
+        find("*[type=submit]").click
+      end
+
+      within ".flash" do
+        expect(page).to have_content("successfully")
+      end
+
+      expect(page).to have_content("My old group")
+      expect(page).to have_content("New description")
+      expect(page).to have_content(@participatory_processes.last.title["en"])
+      expect(page).to have_css("img[src*='#{image2_filename}']")
+    end
+
+    it "can destroy them" do
+      within find("tr", text: participatory_process_group.name["en"]) do
+        click_link "Destroy"
+      end
+
+      within ".flash" do
+        expect(page).to have_content("successfully")
+      end
+
+      within "table" do
+        expect(page).not_to have_content(participatory_process_group.name)
+      end
+    end
+  end
+end

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

@@ -10,6 +10,7 @@ describe "Admin manage participatory processes", type: :feature do
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
+    @participatory_process_groups = create_list(:participatory_process_group, 3, organization: organization)
     visit decidim_admin.participatory_processes_path
   end
 
@@ -46,6 +47,9 @@ describe "Admin manage participatory processes", type: :feature do
         ca: "Descripció més llarga"
       )
 
+      @group_name = @participatory_process_groups.first.name["en"]
+      select @group_name, from: :participatory_process_participatory_process_group_id
+
       fill_in :participatory_process_slug, with: "slug"
       fill_in :participatory_process_hashtag, with: "#hashtag"
       attach_file :participatory_process_hero_image, image1_path
@@ -60,6 +64,7 @@ describe "Admin manage participatory processes", type: :feature do
 
     within ".tabs-content" do
       expect(page).to have_content("My participatory process")
+      expect(page).to have_content(@group_name)
       expect(page).to have_css("img[src*='#{image1_filename}']")
       expect(page).to have_css("img[src*='#{image2_filename}']")
     end

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

@@ -5,7 +5,7 @@ require "spec_helper"
 
 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)) }
+  let!(:user_groups) { create_list(:user_group, 10, users: [create(:user, organization: organization)]) }
 
   before do
     switch_to_host(organization.host)
@@ -13,10 +13,17 @@ describe "Admin manage user groups", type: :feature do
     visit decidim_admin.user_groups_path
   end
 
-  it "verify a user group" do
-    click_button "Verify", match: :first
+  let(:user_group) { user_groups.first }
+
+  it "verifies a user group" do
+    within "tr[data-user-group-id=\"#{user_group.id}\"]" do
+      click_button "Verify", match: :first
+    end
 
-    expect(page).not_to have_selector(".actions button", match: :first)
     expect(page).to have_content("verified successfully")
+
+    within "tr[data-user-group-id=\"#{user_group.id}\"]" do
+      expect(page).to have_no_selector(".actions button", match: :first)
+    end
   end
 end

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(:reference_prefix) { "MSO" }
       let(:twitter_handler) { "My twitter awesome handler" }
       let(:facebook_handler) { "My facebook awesome handler" }
       let(:instagram_handler) { "My instagram awesome handler" }
@@ -30,6 +31,7 @@ module Decidim
         {
           "organization" => {
             "name" => name,
+            "reference_prefix" => reference_prefix,
             "default_locale" => :en,
             "available_locales" => %w{en ca es},
             "welcome_text_en" => welcome_text[:en],

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

@@ -0,0 +1,86 @@
+# coding: utf-8
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Admin
+    describe ParticipatoryProcessGroupForm do
+      let(:organization) { create :organization }
+      let(:participatory_processes) { create_list :participatory_process, 3, organization: organization }
+      let(:name) do
+        {
+          en: "Title",
+          es: "Título",
+          ca: "Títol"
+        }
+      end
+      let(:description) do
+        {
+          en: "Description",
+          es: "Descripción",
+          ca: "Descripció"
+        }
+      end
+      let(:attachment) { test_file("city.jpeg", "image/jpeg") }
+
+      let(:attributes) do
+        {
+          "name_en" => name[:en],
+          "name_es" => name[:es],
+          "name_ca" => name[:ca],
+          "description_en" => description[:en],
+          "description_es" => description[:es],
+          "description_ca" => description[:ca],
+          "hero_image" => attachment,
+          "participatory_processes" => participatory_processes
+        }
+      end
+
+      before do
+        Decidim::AttachmentUploader.enable_processing = true
+      end
+
+      subject { described_class.from_params(attributes).with_context(current_organization: organization) }
+
+      context "when everything is OK" do
+        it { is_expected.to be_valid }
+      end
+
+      context "when hero_image is too big" do
+        before do
+          allow(Decidim).to receive(:maximum_attachment_size).and_return(5.megabytes)
+          expect(subject.hero_image).to receive(:size).and_return(6.megabytes)
+        end
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when images are not the expected type" do
+        let(:attachment) { test_file("Exampledocument.pdf", "application/pdf") }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when some language in title is missing" do
+        let(:name) do
+          {
+            en: "Title",
+            ca: "Títol"
+          }
+        end
+
+        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
+    end
+  end
+end