decidim 0.2.0 → 0.3.0

data/decidim-admin/db/migrate/20161102144648_add_admin_participatory_process_user_roles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAdminParticipatoryProcessUserRoles < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_admin_participatory_process_user_roles do |t|
@@ -8,8 +10,8 @@ class AddAdminParticipatoryProcessUserRoles < ActiveRecord::Migration[5.0]
     end
 
     add_index :decidim_admin_participatory_process_user_roles,
-      [:decidim_participatory_process_id, :decidim_user_id, :role],
-      unique: true,
-      name: "index_unique_user_and_process_role"
+              [:decidim_participatory_process_id, :decidim_user_id, :role],
+              unique: true,
+              name: "index_unique_user_and_process_role"
   end
 end

data/decidim-admin/db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ChangeUserGroupsVerifiedToTimestamp < ActiveRecord::Migration[5.0]
   def change
     ActiveRecord::Base.transaction do

data/decidim-admin/decidim-admin.gemspec

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require_relative "../decidim-core/lib/decidim/core/version"

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

@@ -13,7 +13,7 @@ require "foundation_rails_helper"
 require "autoprefixer-rails"
 require "rectify"
 
-require_dependency File.join(File.dirname(__FILE__), "..", "..", "..", "app/models/decidim/admin/abilities/admin_user")
+require_dependency File.join(__dir__, "..", "..", "..", "app/models/decidim/admin/abilities/admin_user")
 
 module Decidim
   module Admin

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

@@ -35,7 +35,7 @@ RSpec.shared_examples "manage attachments examples" do
     within ".new_participatory_process_attachment" do
       fill_in_i18n(
         :attachment_title,
-        "#title-tabs",
+        "#attachment-title-tabs",
         en: "Very Important Document",
         es: "Documento Muy Importante",
         ca: "Document Molt Important"
@@ -43,7 +43,7 @@ RSpec.shared_examples "manage attachments examples" do
 
       fill_in_i18n(
         :attachment_description,
-        "#description-tabs",
+        "#attachment-description-tabs",
         en: "This document contains important information",
         es: "Este documento contiene información importante",
         ca: "Aquest document conté informació important"
@@ -84,7 +84,7 @@ RSpec.shared_examples "manage attachments examples" do
     within ".edit_participatory_process_attachment" do
       fill_in_i18n(
         :attachment_title,
-        "#title-tabs",
+        "#attachment-title-tabs",
         en: "This is a nice photo",
         es: "Una foto muy guay",
         ca: "Aquesta foto és ben xula"

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

@@ -6,7 +6,7 @@ describe Decidim::Admin::RejectUserGroup do
   let(:organization) { create :organization }
 
   describe "User group validation is pending" do
-    let!(:user_group) { create(:user_group, users: [create(:user, organization: organization)]) }
+    let!(:user_group) { create(:user_group, decidim_organization_id: organization.id, users: [create(:user, organization: organization)]) }
 
     subject { described_class.new(user_group) }
 
@@ -33,7 +33,7 @@ describe Decidim::Admin::RejectUserGroup do
   end
 
   describe "User group is already rejected" do
-    let!(:user_group) { create(:user_group, verified_at: Time.current, users: [create(:user, organization: organization)]) }
+    let!(:user_group) { create(:user_group, decidim_organization_id: organization.id, verified_at: Time.current, users: [create(:user, organization: organization)]) }
 
     subject { described_class.new(user_group) }
 

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

@@ -26,7 +26,7 @@ describe "Admin copy participatory process", type: :feature do
       within ".copy_participatory_process" do
         fill_in_i18n(
           :participatory_process_copy_title,
-          "#title-tabs",
+          "#participatory_process_copy-title-tabs",
           en: "Copy participatory process",
           es: "Copia del proceso participativo",
           ca: "Còpia del procés participatiu"
@@ -48,7 +48,7 @@ describe "Admin copy participatory process", type: :feature do
       within ".copy_participatory_process" do
         fill_in_i18n(
           :participatory_process_copy_title,
-          "#title-tabs",
+          "#participatory_process_copy-title-tabs",
           en: "Copy participatory process",
           es: "Copia del proceso participativo",
           ca: "Còpia del procés participatiu"

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

@@ -9,7 +9,7 @@ describe "Admin invite", type: :feature do
 
   let(:homepage_image_path) do
     File.expand_path(
-      File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", "city.jpeg")
+      File.join(__dir__, "..", "..", "..", "decidim-dev", "spec", "support", "city.jpeg")
     )
   end
 

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

@@ -30,7 +30,7 @@ describe "Admin manages features", type: :feature do
       within ".new_feature" do
         fill_in_i18n(
           :feature_name,
-          "#name-tabs",
+          "#feature-name-tabs",
           en: "My feature",
           ca: "La meva funcionalitat",
           es: "Mi funcionalitat"
@@ -92,7 +92,7 @@ describe "Admin manages features", type: :feature do
       within ".edit_feature" do
         fill_in_i18n(
           :feature_name,
-          "#name-tabs",
+          "#feature-name-tabs",
           en: "My updated feature",
           ca: "La meva funcionalitat actualitzada",
           es: "Mi funcionalidad actualizada"

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

@@ -29,7 +29,7 @@ describe "Admin manages newsletters", type: :feature do
       within ".new_newsletter" do
         fill_in_i18n(
           :newsletter_subject,
-          "#subject-tabs",
+          "#newsletter-subject-tabs",
           en: "A fancy newsletter for %{name}",
           es: "Un correo electrónico muy chulo para %{name}",
           ca: "Un correu electrònic flipant per a %{name}"
@@ -37,7 +37,7 @@ describe "Admin manages newsletters", type: :feature do
 
         fill_in_i18n_editor(
           :newsletter_body,
-          "#body-tabs",
+          "#newsletter-body-tabs",
           en: "Hello %{name}! Relevant content.",
           es: "Hola, %{name}! Contenido relevante.",
           ca: "Hola, %{name}! Contingut rellevant."
@@ -90,7 +90,7 @@ describe "Admin manages newsletters", type: :feature do
       within ".edit_newsletter" do
         fill_in_i18n(
           :newsletter_subject,
-          "#subject-tabs",
+          "#newsletter-subject-tabs",
           en: "A fancy newsletter",
           es: "Un correo electrónico muy chulo",
           ca: "Un correu electrònic flipant"
@@ -98,7 +98,7 @@ describe "Admin manages newsletters", type: :feature do
 
         fill_in_i18n_editor(
           :newsletter_body,
-          "#body-tabs",
+          "#newsletter-body-tabs",
           en: "Relevant content.",
           es: "Contenido relevante.",
           ca: "Contingut rellevant."

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

@@ -17,13 +17,13 @@ describe "Admin manages ogranization", type: :feature do
 
       fill_in "Name", with: "My super-uber organization"
 
-      fill_in_i18n_editor :organization_description, "#description-tabs", en: "My own super description",
-                                                                          es: "Mi gran descripción",
-                                                                          ca: "La meva gran descripció"
+      fill_in_i18n_editor :organization_description, "#organization-description-tabs", en: "My own super description",
+                                                                                       es: "Mi gran descripción",
+                                                                                       ca: "La meva gran descripció"
 
-      fill_in_i18n :organization_welcome_text, "#welcome_text-tabs", en: "My super welcome text",
-                                                                     es: "Mi super texto de bienvenida",
-                                                                     ca: "El meu súper text de benvinguda"
+      fill_in_i18n :organization_welcome_text, "#organization-welcome_text-tabs", en: "My super welcome text",
+                                                                                  es: "Mi super texto de bienvenida",
+                                                                                  ca: "El meu súper text de benvinguda"
 
       %w(Twitter Facebook Instagram YouTube GitHub).each do |network|
         click_link network

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

@@ -19,14 +19,14 @@ describe "Admin manage participatory process groups", type: :feature do
     within ".new_participatory_process_group" do
       fill_in_i18n(
         :participatory_process_group_name,
-        "#name-tabs",
+        "#participatory_process_group-name-tabs",
         en: "My group",
         es: "Mi grupo",
         ca: "El meu grup"
       )
       fill_in_i18n_editor(
         :participatory_process_group_description,
-        "#description-tabs",
+        "#participatory_process_group-description-tabs",
         en: "A longer description",
         es: "Descripción más larga",
         ca: "Descripció més llarga"
@@ -62,14 +62,14 @@ describe "Admin manage participatory process groups", type: :feature do
       within ".edit_participatory_process_group" do
         fill_in_i18n(
           :participatory_process_group_name,
-          "#name-tabs",
+          "#participatory_process_group-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",
+          "#participatory_process_group-description-tabs",
           en: "New description",
           es: "Nueva descripción",
           ca: "Nova descripció"

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

@@ -22,28 +22,28 @@ describe "Admin manage participatory processes", type: :feature do
     within ".new_participatory_process" do
       fill_in_i18n(
         :participatory_process_title,
-        "#title-tabs",
+        "#participatory_process-title-tabs",
         en: "My participatory process",
         es: "Mi proceso participativo",
         ca: "El meu procés participatiu"
       )
       fill_in_i18n(
         :participatory_process_subtitle,
-        "#subtitle-tabs",
+        "#participatory_process-subtitle-tabs",
         en: "Subtitle",
         es: "Subtítulo",
         ca: "Subtítol"
       )
       fill_in_i18n_editor(
         :participatory_process_short_description,
-        "#short_description-tabs",
+        "#participatory_process-short_description-tabs",
         en: "Short description",
         es: "Descripción corta",
         ca: "Descripció curta"
       )
       fill_in_i18n_editor(
         :participatory_process_description,
-        "#description-tabs",
+        "#participatory_process-description-tabs",
         en: "A longer description",
         es: "Descripción más larga",
         ca: "Descripció més llarga"

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

@@ -46,7 +46,7 @@ describe "Content pages", type: :feature do
 
         fill_in_i18n(
           :static_page_title,
-          "#title-tabs",
+          "#static_page-title-tabs",
           en: "Welcome to Decidim",
           es: "Te damos la bienvendida a Decidim",
           ca: "Et donem la benvinguda a Decidim"
@@ -54,7 +54,7 @@ describe "Content pages", type: :feature do
 
         fill_in_i18n_editor(
           :static_page_content,
-          "#content-tabs",
+          "#static_page-content-tabs",
           en: "<p>Some HTML content</p>",
           es: "<p>Contenido HTML</p>",
           ca: "<p>Contingut HTML</p>"
@@ -87,12 +87,12 @@ describe "Content pages", type: :feature do
         within ".edit_static_page" do
           fill_in_i18n(
             :static_page_title,
-            "#title-tabs",
+            "#static_page-title-tabs",
             en: "Not welcomed anymore"
           )
           fill_in_i18n_editor(
             :static_page_content,
-            "#content-tabs",
+            "#static_page-content-tabs",
             en: "This is the new <strong>content</strong>"
           )
           find("*[type=submit]").click

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

@@ -30,7 +30,7 @@ module Decidim
       let(:organization) { create(:organization) }
       let(:homepage_image_path) do
         File.expand_path(
-          File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", "city.jpeg")
+          File.join(__dir__, "..", "..", "..", "decidim-dev", "spec", "support", "city.jpeg")
         )
       end
       let(:attributes) do

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

@@ -15,14 +15,14 @@ RSpec.shared_examples "manage process categories examples" do
     within ".new_participatory_process_category" do
       fill_in_i18n(
         :category_name,
-        "#name-tabs",
+        "#category-name-tabs",
         en: "My category",
         es: "Mi categoría",
         ca: "La meva categoria"
       )
       fill_in_i18n_editor(
         :category_description,
-        "#description-tabs",
+        "#category-description-tabs",
         en: "Description",
         es: "Descripción",
         ca: "Descripció"
@@ -50,7 +50,7 @@ RSpec.shared_examples "manage process categories examples" do
     within ".edit_participatory_process_category" do
       fill_in_i18n(
         :category_name,
-        "#name-tabs",
+        "#category-name-tabs",
         en: "My new name",
         es: "Mi nuevo nombre",
         ca: "El meu nou nom"
@@ -71,44 +71,59 @@ RSpec.shared_examples "manage process categories examples" do
   context "deleting a category" do
     let!(:category2) { create(:category, participatory_process: participatory_process) }
 
-    context "when the category has no subcategories" do
-      before do
-        visit current_path
-      end
+    context "when the category has no associated content" do
+      context "when the category has no subcategories" do
+        before do
+          visit current_path
+        end
+
+        it "deletes a category" do
+          within find("tr", text: translated(category2.name)) do
+            page.find("a.action-icon--remove").click
+          end
 
-      it "deletes a category" do
-        within find("tr", text: translated(category2.name)) do
-          page.find("a.action-icon--remove").click
+          within ".callout-wrapper" do
+            expect(page).to have_content("successfully")
+          end
+
+          within "#categories table" do
+            expect(page).not_to have_content(translated(category2.name))
+          end
         end
+      end
+
+      context "when the category has some subcategories" do
+        let!(:subcategory) { create(:subcategory, parent: category2) }
 
-        within ".callout-wrapper" do
-          expect(page).to have_content("successfully")
+        before do
+          visit current_path
         end
 
-        within "#categories table" do
-          expect(page).not_to have_content(translated(category2.name))
+        it "deletes a category" do
+          within find("tr", text: translated(category2.name)) do
+            page.find("a.action-icon--remove").click
+          end
+
+          within ".callout-wrapper" do
+            expect(page).to have_content("error deleting")
+          end
+
+          within "#categories table" do
+            expect(page).to have_content(translated(category2.name))
+          end
         end
       end
     end
 
-    context "when the category has some subcategories" do
-      let!(:subcategory) { create(:subcategory, parent: category2) }
+    context "when the category has associated content" do
+      let!(:feature) { create(:feature, participatory_process: participatory_process) }
+      let!(:dummy_resource) { create(:dummy_resource, feature: feature, category: category) }
 
-      before do
+      it "cannot delete it" do
         visit current_path
-      end
-
-      it "deletes a category" do
-        within find("tr", text: translated(category2.name)) do
-          page.find("a.action-icon--remove").click
-        end
-
-        within ".callout-wrapper" do
-          expect(page).to have_content("error deleting")
-        end
 
-        within "#categories table" do
-          expect(page).to have_content(translated(category2.name))
+        within find("tr", text: translated(category.name)) do
+          expect(page).not_to have_selector("a.action-icon--remove")
         end
       end
     end

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

@@ -22,14 +22,14 @@ RSpec.shared_examples "manage process steps examples" do
 
     fill_in_i18n(
       :participatory_process_step_title,
-      "#title-tabs",
+      "#participatory_process_step-title-tabs",
       en: "My participatory process step",
       es: "Mi fase de proceso participativo",
       ca: "La meva fase de procés participatiu"
     )
     fill_in_i18n_editor(
       :participatory_process_step_description,
-      "#description-tabs",
+      "#participatory_process_step-description-tabs",
       en: "A longer description",
       es: "Descripción más larga",
       ca: "Descripció més llarga"
@@ -65,7 +65,7 @@ RSpec.shared_examples "manage process steps examples" do
     within ".edit_participatory_process_step" do
       fill_in_i18n(
         :participatory_process_step_title,
-        "#title-tabs",
+        "#participatory_process_step-title-tabs",
         en: "My new title",
         es: "Mi nuevo título",
         ca: "El meu nou títol"

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

@@ -34,7 +34,7 @@ RSpec.shared_examples "manage processes examples" do
 
     fill_in_i18n(
       :participatory_process_title,
-      "#title-tabs",
+      "#participatory_process-title-tabs",
       en: "My new title",
       es: "Mi nuevo título",
       ca: "El meu nou títol"