decidim 0.0.2 → 0.0.3

data/decidim-admin/config/locales/en.yml

@@ -2,15 +2,21 @@
 en:
   activemodel:
     attributes:
+      attachment:
+        description: Description
+        file: File
+        title: Title
       category:
         description: Description
         name: Name
         parent: Parent
       feature:
         name: Name
+        weight: Weight
       organization:
         default_locale: Default locale
         description: Description
+        favicon: Icon
         homepage_image: Homepage image
         logo: Logo
         name: Name
@@ -26,10 +32,6 @@ en:
         slug: URL slug
         subtitle: Subtitle
         title: Title
-      participatory_process_attachment:
-        description: Description
-        file: File
-        title: Title
       participatory_process_step:
         description: Description
         end_date: End date
@@ -67,6 +69,21 @@ en:
         title: Actions
         unpublish: Unpublish
         verify: Verify
+      attachments:
+        create:
+          error: There was an error creating a new attachment.
+          success: Attachment created successfully.
+        destroy:
+          success: Attachment destroyed successfully.
+        edit:
+          title: Edit attachment
+          update: Update attachment
+        new:
+          create: Create attachment
+          title: New attachment
+        update:
+          error: There was an error when updating this attachment.
+          success: Attachment updated successfully.
       categories:
         create:
           error: There was an error creating this category.
@@ -85,12 +102,12 @@ en:
           success: Category updated successfully.
       decidim:
         admin:
+          attachments:
+            index:
+              attachments_title: Attachments
           categories:
             index:
               categories_title: Categories
-          participatory_process_attachments:
-            index:
-              attachments_title: Attachments
           participatory_process_steps:
             index:
               steps_hint: You can drag the rows of the table in order to reorder the process steps.
@@ -141,6 +158,11 @@ en:
         user_groups: User groups
         users: Admin users
       models:
+        attachment:
+          fields:
+            content_type: Type
+            title: Title
+          name: Attachment
         category:
           fields:
             name: Name
@@ -152,11 +174,6 @@ en:
             published: Published
             title: Title
           name: Participatory process
-        participatory_process_attachment:
-          fields:
-            content_type: Type
-            title: Title
-          name: Attachment
         participatory_process_step:
           fields:
             active: Active
@@ -200,21 +217,6 @@ en:
         update:
           error: There was an error when updating this organization.
           success: Organization updated successfully.
-      participatory_process_attachments:
-        create:
-          error: There was an error creating a new attachment.
-          success: Attachment created successfully.
-        destroy:
-          success: Attachment destroyed successfully.
-        edit:
-          title: Edit attachment
-          update: Update attachment
-        new:
-          create: Create attachment
-          title: New attachment
-        update:
-          error: There was an error when updating this attachment.
-          success: Attachment updated successfully.
       participatory_process_publications:
         create:
           error: There was an error publishing this participatory process.

data/decidim-admin/config/locales/es.yml

@@ -1,15 +1,21 @@
 es:
   activemodel:
     attributes:
+      attachment:
+        description: Descripción
+        file: Archivo
+        title: Título
       category:
         description: Descripción
         name: Nombre
         parent: Padre
       feature:
         name: Nombre
+        weight: Peso
       organization:
         default_locale: Configuración regional predeterminada
         description: Descripción
+        favicon: Icono
         homepage_image: Imagen de portada
         logo: Logotipo
         name: Nombre
@@ -25,10 +31,6 @@ es:
         slug: Texto corto de URL
         subtitle: Subtítulo
         title: Título
-      participatory_process_attachment:
-        description: Descripción
-        file: Archivo
-        title: Título
       participatory_process_step:
         description: Descripción
         end_date: Fecha de finalización
@@ -66,6 +68,21 @@ es:
         title: Acciones
         unpublish: Despublicar
         verify: Verificar
+      attachments:
+        create:
+          error: Se ha producido un error al crear un nuevo archivo adjunto.
+          success: Adjunto creado correctamente.
+        destroy:
+          success: El archivo adjunto se ha eliminado correctamente.
+        edit:
+          title: Editar archivo adjunto
+          update: Actualizar archivo adjunto
+        new:
+          create: Crear archivo adjunto
+          title: Nuevo archivo adjunto
+        update:
+          error: Se ha producido un error al actualizar este archivo adjunto.
+          success: Adjunto actualizado correctamente.
       categories:
         create:
           error: Se ha producido un error al crear esta categoría.
@@ -84,12 +101,12 @@ es:
           success: Categoría actualizada correctamente.
       decidim:
         admin:
+          attachments:
+            index:
+              attachments_title: Archivos adjuntos
           categories:
             index:
               categories_title: Categorías
-          participatory_process_attachments:
-            index:
-              attachments_title: Archivos adjuntos
           participatory_process_steps:
             index:
               steps_hint: Puedes arrastrar las filas de la tabla para reordenar las fases del proceso.
@@ -140,6 +157,11 @@ es:
         user_groups: Grupos de usuarios
         users: Administradores
       models:
+        attachment:
+          fields:
+            content_type: Tipo
+            title: Título
+          name: Archivo adjunto
         category:
           fields:
             name: Nombre
@@ -151,11 +173,6 @@ es:
             published: Publicado
             title: Título
           name: Proceso participativo
-        participatory_process_attachment:
-          fields:
-            content_type: Tipo
-            title: Título
-          name: Archivo adjunto
         participatory_process_step:
           fields:
             active: Activa
@@ -199,21 +216,6 @@ es:
         update:
           error: Se produjo un error al actualizar esta organización.
           success: Organización actualizada correctamente.
-      participatory_process_attachments:
-        create:
-          error: Se ha producido un error al crear un nuevo archivo adjunto.
-          success: Adjunto creado correctamente.
-        destroy:
-          success: El archivo adjunto se ha eliminado correctamente.
-        edit:
-          title: Editar archivo adjunto
-          update: Actualizar archivo adjunto
-        new:
-          create: Crear archivo adjunto
-          title: Nuevo archivo adjunto
-        update:
-          error: Se ha producido un error al actualizar este archivo adjunto.
-          success: Adjunto actualizado correctamente.
       participatory_process_publications:
         create:
           error: Se ha producido un error al publicar este proceso participativo.

data/decidim-admin/config/routes.rb

@@ -27,7 +27,7 @@ Decidim::Admin::Engine.routes.draw do
         end
       end
 
-      get "/" => proc { raise "Feature not found" }, as: :manage_feature
+      get "/", to: redirect("/404"), as: :manage_feature
     end
 
     resources :static_pages

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

@@ -0,0 +1,9 @@
+class ChangeUserGroupsVerifiedToTimestamp < ActiveRecord::Migration[5.0]
+  def change
+    ActiveRecord::Base.transaction do
+      add_column :decidim_user_groups, :verified_at, :datetime
+      ActiveRecord::Base.connection.execute("UPDATE decidim_user_groups SET verified_at = '#{Time.current.to_s(:db)}' WHERE verified = 't'")
+      remove_column :decidim_user_groups, :verified
+    end
+  end
+end

data/decidim-admin/decidim-admin.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency "devise_invitable", "~> 1.7.0"
   s.add_dependency "sassc-rails", "~> 1.3.0"
   s.add_dependency "jquery-rails", "~> 4.2.2"
-  s.add_dependency "turbolinks", *Decidim.rails_version
   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"

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

@@ -7,7 +7,6 @@ require "devise-i18n"
 require "decidim/core"
 require "jquery-rails"
 require "sassc-rails"
-require "turbolinks"
 require "foundation-rails"
 require "foundation_rails_helper"
 require "rectify"
@@ -32,7 +31,8 @@ module Decidim
 
       initializer "decidim_admin.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.abilities += [Decidim::Admin::Abilities::AdminUser]
+          config.abilities += ["Decidim::Admin::Abilities::AdminUser"]
+          config.abilities += ["Decidim::Admin::Abilities::ParticipatoryProcessAdmin"]
         end
       end
     end

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

@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+RSpec.shared_examples "manage attachments examples" do
+  let!(:attachment) do
+    Decidim::AttachmentUploader.enable_processing = true
+    create(:attachment, attached_to: attached_to)
+  end
+
+  before do
+    visit current_path
+  end
+
+  it "lists all the attachments for the process" do
+    within "#attachments table" do
+      expect(page).to have_content(translated(attachment.title, locale: :en))
+      expect(page).to have_content(attachment.file_type)
+    end
+  end
+
+  it "can view an attachment details" do
+    within "#attachments table" do
+      click_link translated(attachment.title, locale: :en)
+    end
+
+    expect(page).to have_content(stripped(translated(attachment.title, locale: :en)))
+    expect(page).to have_content(stripped(translated(attachment.description, locale: :en)))
+    expect(page).to have_content(attachment.file_type)
+    expect(page).to have_css("img[src~='#{attachment.thumbnail_url}']")
+  end
+
+  it "can add attachments to a process" do
+    find("#attachments .actions .new").click
+
+    within ".new_attachment" do
+      fill_in_i18n(
+        :attachment_title,
+        "#title-tabs",
+        en: "Very Important Document",
+        es: "Documento Muy Importante",
+        ca: "Document Molt Important"
+      )
+
+      fill_in_i18n(
+        :attachment_description,
+        "#description-tabs",
+        en: "This document contains important information",
+        es: "Este documento contiene información importante",
+        ca: "Aquest document conté informació important"
+      )
+
+      attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+      find("*[type=submit]").click
+    end
+
+    within ".flash" do
+      expect(page).to have_content("successfully")
+    end
+
+    within "#attachments table" do
+      expect(page).to have_link("Very Important Document")
+    end
+  end
+
+  it "can delete an attachment from a process" do
+    within find("tr", text: stripped(translated(attachment.title))) do
+      click_link "Destroy"
+    end
+
+    within ".flash" do
+      expect(page).to have_content("successfully")
+    end
+
+    expect(page).not_to have_content(translated(attachment.title, locale: :en))
+  end
+
+  it "can update an attachment" do
+    within "#attachments" do
+      within find("tr", text: stripped(translated(attachment.title))) do
+        click_link "Edit"
+      end
+    end
+
+    within ".edit_attachment" do
+      fill_in_i18n(
+        :attachment_title,
+        "#title-tabs",
+        en: "This is a nice photo",
+        es: "Una foto muy guay",
+        ca: "Aquesta foto és ben xula"
+      )
+
+      find("*[type=submit]").click
+    end
+
+    within ".flash" do
+      expect(page).to have_content("successfully")
+    end
+
+    within "#attachments table" do
+      expect(page).to have_link("This is a nice photo")
+    end
+  end
+end

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

@@ -41,7 +41,7 @@ module Decidim
           it "doesn't create a category" do
             expect do
               command.call
-            end.to_not change { Category.count }
+            end.not_to change { Category.count }
           end
         end
 

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

@@ -37,7 +37,7 @@ module Decidim
             CreateFeature.call(manifest, form, participatory_process)
           }.to broadcast(:ok)
 
-          expect(participatory_process.features).to_not be_empty
+          expect(participatory_process.features).not_to be_empty
 
           feature = participatory_process.features.first
           expect(feature.settings.dummy_global_attribute_1).to eq(true)

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

@@ -2,6 +2,7 @@ require "spec_helper"
 
 describe Decidim::Admin::CreateParticipatoryProcess do
   let(:organization) { create :organization }
+  let(:errors) { double.as_null_object }
   let(:form) do
     double(
       :invalid? => invalid,
@@ -14,7 +15,8 @@ describe Decidim::Admin::CreateParticipatoryProcess do
       promoted: nil,
       description: {en: "description"},
       short_description: {en: "short_description"},
-      current_organization: organization
+      current_organization: organization,
+      errors: errors
     )
   end
   let(:invalid) { false }
@@ -24,11 +26,39 @@ describe Decidim::Admin::CreateParticipatoryProcess do
   context "when the form is not valid" do
     let(:invalid) { true }
 
-    it "is not valid" do
+    it "broadcasts invalid" do
       expect { subject.call }.to broadcast(:invalid)
     end
   end
 
+  context "when the process is not persisted" do
+    let(:invalid_process) do
+      instance_double(
+        Decidim::ParticipatoryProcess,
+        persisted?: false,
+        valid?: false,
+        errors: {
+          hero_image: "Image too big",
+          banner_image: "Image too big"
+        }
+      ).as_null_object
+    end
+
+    before do
+      expect(Decidim::ParticipatoryProcess).to receive(:new).and_return(invalid_process)
+    end
+
+    it "broadcasts invalid" do
+      expect { subject.call }.to broadcast(:invalid)
+    end
+
+    it "adds errors to the form" do
+      expect(errors).to receive(:add).with(:hero_image, "Image too big")
+      expect(errors).to receive(:add).with(:banner_image, "Image too big")
+      subject.call
+    end
+  end
+
   context "when everything is ok" do
     it "creates a participatory process" do
       expect { subject.call }.to change { Decidim::ParticipatoryProcess.count }.by(1)