decidim 0.5.1 → 0.6.0

data/decidim-core/lib/decidim/query_extensions.rb

@@ -16,7 +16,7 @@ module Decidim
           description "Lists all processes."
 
           resolve lambda { |_obj, _args, ctx|
-            OrganizationPublishedParticipatoryProcesses.new(ctx[:current_organization])
+            ParticipatoryProcesses::OrganizationPublishedParticipatoryProcesses.new(ctx[:current_organization])
           }
         end
 

data/decidim-core/lib/decidim/resource_manifest.rb

@@ -43,7 +43,7 @@ module Decidim
     #
     # Returns an ActiveRecord::Relation.
     def resource_scope(feature)
-      feature_ids = Decidim::Feature.where(participatory_process: feature.participatory_process, manifest_name: feature_manifest.name).pluck(:id)
+      feature_ids = Decidim::Feature.where(participatory_space: feature.participatory_space, manifest_name: feature_manifest.name).pluck(:id)
       return model_class.none if feature_ids.empty?
 
       model_class.where(feature: feature_ids)

data/decidim-core/lib/decidim/settings_manifest.rb

@@ -52,10 +52,6 @@ module Decidim
           self.class.manifest
         end
 
-        def ==(other)
-          other.attributes == attributes
-        end
-
         manifest.attributes.each do |name, attribute|
           if attribute.translated?
             translatable_attribute name, attribute.type_class, default: attribute.default_value

data/decidim-core/spec/commands/decidim/create_registration_spec.rb

@@ -74,9 +74,7 @@ module Decidim
               password_confirmation: form.password_confirmation,
               tos_agreement: form.tos_agreement,
               newsletter_notifications: form.newsletter_notifications,
-              organization: organization,
-              comments_notifications: true,
-              replies_notifications: true
+              organization: organization
             ).and_call_original
 
             expect { command.call }.to change { User.count }.by(1)

data/decidim-core/spec/commands/decidim/update_notifications_settings_spec.rb

@@ -9,16 +9,14 @@ module Decidim
     let(:valid) { true }
     let(:data) do
       {
-        comments_notifications: "1",
-        replies_notifications: "0",
+        email_on_notification: "1",
         newsletter_notifications: "1"
       }
     end
 
     let(:form) do
       form = double(
-        comments_notifications: data[:comments_notifications],
-        replies_notifications: data[:replies_notifications],
+        email_on_notification: data[:email_on_notification],
         newsletter_notifications: data[:newsletter_notifications],
         valid?: valid
       )
@@ -31,7 +29,6 @@ module Decidim
 
       it "Doesn't update anything" do
         expect { command.call }.to broadcast(:invalid)
-        expect(user.reload.replies_notifications).to be_truthy
       end
     end
 
@@ -40,8 +37,7 @@ module Decidim
 
       it "updates the users's notifications settings" do
         expect { command.call }.to broadcast(:ok)
-        expect(user.reload.comments_notifications).to be_truthy
-        expect(user.reload.replies_notifications).to be_falsy
+        expect(user.reload.email_on_notification).to be_truthy
         expect(user.reload.newsletter_notifications).to be_truthy
       end
     end

data/decidim-core/spec/controllers/concerns/settings_spec.rb

@@ -5,7 +5,7 @@ require "spec_helper"
 module Decidim
   describe ActionController::Base, type: :controller do
     let(:feature) { create(:feature) }
-    let(:participatory_process) { feature.participatory_process }
+    let(:participatory_process) { feature.participatory_space }
 
     before do
       allow(controller).to receive(:current_feature).and_return(feature)
@@ -15,16 +15,24 @@ module Decidim
       include Decidim::Settings
     end
 
+    matcher :be_equivalent_to do |expected|
+      match do |actual|
+        actual.attributes == expected.attributes
+      end
+    end
+
     describe "#feature_settings" do
       it "returns the current feature's configuration" do
-        expect(controller.feature_settings).to eq(feature.settings)
+        expect(controller.feature_settings)
+          .to be_equivalent_to(feature.settings)
       end
     end
 
     describe "current_settings" do
       context "when no step is active" do
         it "returns the default step settings" do
-          expect(controller.current_settings).to eq(feature.default_step_settings)
+          expect(controller.current_settings)
+            .to be_equivalent_to(feature.default_step_settings)
         end
       end
 
@@ -37,7 +45,7 @@ module Decidim
 
         it "returns the settings for the active step" do
           expect(controller.current_settings)
-            .to eq(feature.step_settings[step.id.to_s])
+            .to be_equivalent_to(feature.step_settings[step.id.to_s])
         end
       end
     end

data/decidim-core/spec/controllers/locales_controller_spec.rb

@@ -15,6 +15,10 @@ module Decidim
     describe "POST create" do
       let(:locale) { "ca" }
 
+      around do |example|
+        I18n.with_locale(I18n.locale) { example.run }
+      end
+
       context "when the user is signed in" do
         let(:user) { create(:user, :confirmed, locale: "en", organization: organization) }
 

data/decidim-core/spec/controllers/pages_controller_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "decidim/dev/test/promoted_participatory_processes_shared_examples"
 
 module Decidim
   module Devise

data/decidim-core/spec/controllers/scopes_controller_spec.rb

@@ -45,6 +45,10 @@ module Decidim
       it "result has text" do
         expect(subject.first).to have_key("text")
       end
+
+      it "doesn't store the location for user" do
+        expect(controller.stored_location_for(user)).to be_nil
+      end
     end
 
     context "search top scopes" do

data/decidim-core/spec/factories.rb

@@ -2,6 +2,7 @@
 
 require "decidim/core/test/factories"
 
+require "decidim/participatory_processes/test/factories"
 require "decidim/proposals/test/factories"
 require "decidim/meetings/test/factories"
 require "decidim/results/test/factories"

data/decidim-core/spec/features/account_spec.rb

@@ -105,14 +105,6 @@ describe "Account", type: :feature, perform_enqueued: true do
       end
 
       it "updates the user's notifications" do
-        within ".switch.comments_notifications" do
-          page.find(".switch-paddle").click
-        end
-
-        within ".switch.replies_notifications" do
-          page.find(".switch-paddle").click
-        end
-
         within ".switch.newsletter_notifications" do
           page.find(".switch-paddle").click
         end

data/decidim-core/spec/features/components_spec.rb

@@ -9,7 +9,7 @@ describe "Features can be navigated", type: :feature do
 
   describe "navigate to a component" do
     before do
-      visit decidim.participatory_process_path(participatory_process)
+      visit decidim_participatory_processes.participatory_process_path(participatory_process)
     end
 
     it "renders the content of the page" do

data/decidim-core/spec/features/homepage_spec.rb

@@ -28,6 +28,15 @@ describe "Homepage", type: :feature do
       expect(page).to have_selector("a.main-footer__badge[href='#{official_url}']")
     end
 
+    context "with header snippets" do
+      let(:snippet) { "<meta data-hello=\"This is the organization header_snippet field\">" }
+      let(:organization) { create(:organization, official_url: official_url, header_snippets: snippet) }
+
+      it "includes the header snippets" do
+        expect(page).to have_selector("meta[data-hello]", visible: false)
+      end
+    end
+
     it "welcomes the user" do
       expect(page).to have_content(organization.name)
     end

data/decidim-core/spec/features/menu_spec.rb

@@ -20,9 +20,10 @@ describe "Menu", type: :feature do
   it "renders the default main menu" do
     within ".main-nav" do
       expect(page).to \
-        have_selector("li", count: 3) &
+        have_selector("li", count: 4) &
         have_link("Home", href: "/") &
         have_link("Processes", href: "/processes") &
+        have_link("Assemblies", href: "/assemblies") &
         have_link("More information", href: "/pages")
     end
   end

data/decidim-core/spec/features/notifications_spec.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Notifications", type: :feature do
+  let(:resource) { create :dummy_resource }
+  let(:participatory_space) { resource.feature.participatory_space }
+  let(:organization) { participatory_space.organization }
+  let!(:user) { create :user, :confirmed, organization: organization }
+  let!(:notification) { create :notification, user: user, resource: resource }
+
+  before do
+    switch_to_host organization.host
+    login_as user, scope: :user
+  end
+
+  context "accessing the notifications page" do
+    before do
+      page.visit decidim.root_path
+    end
+
+    it "has a button on the topbar nav that links to the notifications page" do
+      within ".topbar__user__logged" do
+        find("a.topbar__notifications").click
+        expect(current_path).to eq decidim.notifications_path
+      end
+    end
+
+    context "when there are no notifications" do
+      let!(:notification) { nil }
+
+      it "the button is not shown as active" do
+        within ".topbar__user__logged" do
+          expect(page).to have_no_selector("a.topbar__notifications.is-active")
+          expect(page).to have_selector("a.topbar__notifications")
+        end
+      end
+    end
+
+    context "when there are some notifications" do
+      it "the button is shown as active" do
+        within ".topbar__user__logged" do
+          expect(page).to have_selector("a.topbar__notifications.is-active")
+        end
+      end
+    end
+  end
+
+  context "when no notification is found" do
+    let!(:notification) { nil }
+
+    before do
+      page.visit decidim.notifications_path
+    end
+
+    it "doesn't show any notification" do
+      expect(page).to have_content("No notifications yet")
+    end
+  end
+
+  context "with notifications" do
+    it "shows the notifications" do
+      expect(page).to have_selector("section#notifications-list .card--list__item")
+    end
+
+    before do
+      page.visit decidim.notifications_path
+    end
+
+    context "when setting a single notification as read" do
+      let(:notification_title) { "An event occured to #{resource.title}" }
+
+      it "hides the notification from the page" do
+        expect(page).to have_content(notification_title)
+        find(".mark-as-read-button").click
+        expect(page).to have_no_content(notification_title)
+        expect(page).to have_content("No notifications yet")
+      end
+    end
+
+    context "when setting all notifications as read" do
+      it "hides all notifications from the page" do
+        click_link "Mark all as read"
+        expect(page).to have_content("No notifications yet")
+      end
+    end
+  end
+end

data/decidim-core/spec/forms/notifications_settings_form_spec.rb

@@ -6,14 +6,12 @@ module Decidim
   describe NotificationsSettingsForm do
     let(:user) { create(:user) }
 
-    let(:comments_notifications) { "1" }
-    let(:replies_notifications) { "1" }
+    let(:email_on_notification) { "1" }
     let(:newsletter_notifications) { "1" }
 
     subject do
       described_class.new(
-        comments_notifications: comments_notifications,
-        replies_notifications: replies_notifications,
+        email_on_notification: email_on_notification,
         newsletter_notifications: newsletter_notifications
       ).with_context(
         current_user: user
@@ -26,16 +24,8 @@ module Decidim
       end
     end
 
-    context "with an empty comments notifications" do
-      let(:comments_notifications) { "" }
-
-      it "is invalid" do
-        expect(subject).not_to be_valid
-      end
-    end
-
-    context "with an empty replies notifications" do
-      let(:replies_notifications) { "" }
+    context "with an empty email on notification" do
+      let(:email_on_notification) { "" }
 
       it "is invalid" do
         expect(subject).not_to be_valid

data/decidim-core/spec/helpers/decidim/decidim_form_helper_spec.rb

@@ -13,6 +13,9 @@ module Decidim
             abide: true,
             "live-validate" => true,
             "validate-on-blur" => true
+          },
+          html: {
+            novalidate: true
           }
         }
 

data/decidim-core/spec/helpers/decidim/feature_path_helper_spec.rb

@@ -7,7 +7,7 @@ module Decidim
     let(:participatory_process) { create(:participatory_process, id: 42) }
 
     let(:feature) do
-      create(:feature, id: 21, participatory_process: participatory_process)
+      create(:feature, id: 21, participatory_space: participatory_process)
     end
 
     describe "main_feature_path" do

data/decidim-core/spec/jobs/decidim/email_notification_generator_job_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::EmailNotificationGeneratorJob do
+  subject { described_class }
+
+  describe "queue" do
+    it "is queued to events" do
+      expect(subject.queue_name).to eq "decidim_events"
+    end
+  end
+
+  describe "perform" do
+    let(:event) { double :event }
+    let(:event_class) { Decidim::Events::BaseEvent }
+    let(:event_class_name) { "Decidim::Events::BaseEvent" }
+    let(:resource) { double :resource }
+    let(:generator) { double :generator }
+    let(:recipient_ids) { [1, 2, 3] }
+    let(:extra) { double }
+
+    it "delegates the work to the class" do
+      expect(Decidim::EmailNotificationGenerator)
+        .to receive(:new)
+        .with(event, event_class, resource, recipient_ids, extra)
+        .and_return(generator)
+      expect(generator)
+        .to receive(:generate)
+
+      subject.perform_now(event, event_class_name, resource, recipient_ids, extra)
+    end
+  end
+end

data/decidim-core/spec/jobs/decidim/notification_generator_for_recipient_job_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::NotificationGeneratorForRecipientJob do
+  subject { described_class }
+
+  describe "queue" do
+    it "is queued to events" do
+      expect(subject.queue_name).to eq "decidim_events"
+    end
+  end
+
+  describe "perform" do
+    let(:event) { double :event }
+    let(:event_class) { Decidim::Events::BaseEvent }
+    let(:event_class_name) { "Decidim::Events::BaseEvent" }
+    let(:resource) { double :resource }
+    let(:recipient) { double :recipient }
+    let(:extra) { double }
+    let(:generator) { double :generator }
+
+    it "delegates the work to the class" do
+      expect(Decidim::NotificationGeneratorForRecipient)
+        .to receive(:new)
+        .with(event, event_class, resource, recipient, extra)
+        .and_return(generator)
+      expect(generator)
+        .to receive(:generate)
+
+      subject.perform_now(event, event_class_name, resource, recipient, extra)
+    end
+  end
+end

data/decidim-core/spec/jobs/decidim/notification_generator_job_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::NotificationGeneratorJob do
+  subject { described_class }
+
+  describe "queue" do
+    it "is queued to events" do
+      expect(subject.queue_name).to eq "decidim_events"
+    end
+  end
+
+  describe "perform" do
+    let(:event) { double :event }
+    let(:event_class) { Decidim::Events::BaseEvent }
+    let(:event_class_name) { "Decidim::Events::BaseEvent" }
+    let(:resource) { double :resource }
+    let(:generator) { double :generator }
+    let(:recipient_ids) { [1, 2, 3] }
+    let(:extra) { double }
+
+    it "delegates the work to the class" do
+      expect(Decidim::NotificationGenerator)
+        .to receive(:new)
+        .with(event, event_class, resource, recipient_ids, extra)
+        .and_return(generator)
+      expect(generator)
+        .to receive(:generate)
+
+      subject.perform_now(event, event_class_name, resource, recipient_ids, extra)
+    end
+  end
+end