decidim 0.5.1 → 0.6.0

data/decidim-assemblies/spec/forms/category_form_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/admin/test/forms/category_form_examples"
+
+module Decidim
+  module Admin
+    describe CategoryForm do
+      include_examples "category form" do
+        let(:participatory_space) do
+          create :assembly, organization: organization
+        end
+      end
+    end
+  end
+end

data/decidim-assemblies/spec/helpers/decidim/scopes_helper_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "provides valid scope helpers" do
+  let(:participatory_space) do
+    create(
+      :assembly,
+      organization: organization,
+      scopes_enabled: scopes_enabled,
+      scope: participatory_space_scope
+    )
+  end
+
+  include_examples "scope helpers"
+end

data/decidim-assemblies/spec/lib/features/assemblies/current_feature_spec.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Assemblies
+    describe CurrentFeature do
+      let(:request) { double(params: params, env: env) }
+      let(:subject) { described_class.new(manifest) }
+      let(:params) { {} }
+      let(:manifest) { Decidim.find_feature_manifest("dummy") }
+
+      let(:organization) do
+        create(:organization)
+      end
+
+      let(:current_assembly) { create(:assembly, organization: organization) }
+      let(:other_assembly) { create(:assembly, organization: organization) }
+
+      let(:env) do
+        { "decidim.current_organization" => organization }
+      end
+
+      context "when the params contain an assembly id" do
+        before do
+          params["assembly_id"] = current_assembly.id.to_s
+        end
+
+        context "when the params don't contain a feature id" do
+          it "doesn't match" do
+            expect(subject.matches?(request)).to eq(false)
+          end
+        end
+
+        context "when the params contain a feature id" do
+          before do
+            params["feature_id"] = feature.id.to_s
+          end
+
+          context "when the feature doesn't belong to the assembly" do
+            let(:feature) { create(:feature, participatory_space: other_assembly) }
+
+            it "matches" do
+              expect(subject.matches?(request)).to eq(false)
+            end
+          end
+
+          context "when the feature belongs to the assembly" do
+            let(:feature) { create(:feature, participatory_space: current_assembly) }
+
+            it "matches" do
+              expect(subject.matches?(request)).to eq(true)
+            end
+          end
+        end
+      end
+
+      context "when the params don't contain an assembly id" do
+        it "doesn't match" do
+          expect(subject.matches?(request)).to eq(false)
+        end
+      end
+
+      context "when the params contain a non existing assembly id" do
+        before do
+          params["assembly_id"] = "99999999"
+        end
+
+        context "when there's no feature" do
+          it "doesn't match" do
+            expect(subject.matches?(request)).to eq(false)
+          end
+        end
+
+        context "when there's feature" do
+          before do
+            params["feature_id"] = "1"
+          end
+
+          it "doesn't match" do
+            expect(subject.matches?(request)).to eq(false)
+          end
+        end
+      end
+    end
+  end
+end

data/decidim-assemblies/spec/models/abilities/admin/admin_ability_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::Abilities::Admin::AdminAbility do
+  let(:user) { build(:user, :admin) }
+
+  subject { described_class.new(user, {}) }
+
+  it { is_expected.to be_able_to(:manage, Decidim::Assembly) }
+end

data/decidim-assemblies/spec/models/abilities/admin_ability_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::Abilities::AdminAbility do
+  let(:user) { build(:user, :admin) }
+  let(:context) { {} }
+
+  subject { described_class.new(user, context) }
+
+  it { is_expected.to be_able_to(:read, Decidim::Assembly) }
+end

data/decidim-assemblies/spec/models/abilities/everyone_ability_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::Abilities::EveryoneAbility do
+  let(:user) { build(:user) }
+
+  subject { described_class.new(user, {}) }
+
+  it "lets the user read assemblies" do
+    expect(subject.permissions[:can][:read]).to include("Decidim::Assembly")
+  end
+end

data/decidim-assemblies/spec/models/decidim/assembly_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe Assembly do
+    let(:assembly) { build(:assembly, slug: "my-slug") }
+    subject { assembly }
+
+    it { is_expected.to be_valid }
+
+    include_examples "publicable"
+
+    context "when there's an assembly with the same slug in the same organization" do
+      let!(:external_assembly) { create :assembly, organization: assembly.organization, slug: "my-slug" }
+
+      it "is not valid" do
+        expect(subject).not_to be_valid
+        expect(subject.errors[:slug]).to eq ["has already been taken"]
+      end
+    end
+
+    context "when there's an assembly with the same slug in another organization" do
+      let!(:external_assembly) { create :assembly, slug: "my-slug" }
+
+      it { is_expected.to be_valid }
+    end
+  end
+end

data/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_stats_presenter.spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe AssemblyStatsPresenter do
+    let!(:organization) { create(:organization) }
+    let!(:user) { create(:user, :confirmed, organization: organization) }
+    let!(:assembly) { create(:assembly, organization: organization) }
+    let!(:feature) { create(:feature, participatory_space: assembly) }
+    let!(:feature2) { create(:feature, participatory_space: assembly) }
+    let!(:feature3) { create(:feature, participatory_space: assembly) }
+
+    subject { described_class.new(assembly: assembly) }
+
+    before do
+      feature.manifest.stats.register :foo, priority: StatsRegistry::HIGH_PRIORITY, &proc { 10 }
+      feature2.manifest.stats.register :bar, priority: StatsRegistry::MEDIUM_PRIORITY, &proc { 20 }
+      feature3.manifest.stats.register :baz, priority: StatsRegistry::LOW_PRIORITY, &proc { 30 }
+      I18n.backend.store_translations(
+        :en,
+        decidim: {
+          assemblies: {
+            statistics: {
+              foo: "Foo",
+              bar: "Bar",
+              baz: "Baz"
+            }
+          }
+        }
+      )
+
+      allow(Decidim).to receive(:feature_manifests).and_return([feature.manifest, feature2.manifest, feature3.manifest])
+    end
+
+    describe "#highlighted" do
+      it "renders a collection of stats including users and proceses" do
+        expect(subject.highlighted).to include("10 Foo")
+        expect(subject.highlighted).to include("20 Bar")
+        expect(subject.highlighted).to_not include("30 Baz")
+      end
+    end
+  end
+end

data/decidim-assemblies/spec/queries/admin/assembly_admins_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::Admin::AdminUsers do
+  let(:organization) { create :organization }
+  let(:assembly) { create :assembly, organization: organization }
+  let!(:admin) { create(:user, :admin, :confirmed, organization: organization) }
+  let!(:assembly_admin) do
+    create(:user, :admin, :confirmed, organization: organization)
+  end
+
+  subject { described_class.new(assembly) }
+
+  it "returns the organization admins and assembly admins" do
+    expect(subject.query).to match_array([admin, assembly_admin])
+  end
+end

data/decidim-assemblies/spec/queries/organization_assemblies_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::OrganizationAssemblies do
+  subject { described_class.new(organization) }
+
+  let!(:organization) { create(:organization) }
+  let!(:local_assemblies) do
+    create_list(:assembly, 3, organization: organization)
+  end
+
+  let!(:foreign_assemblies) do
+    create_list(:assembly, 3)
+  end
+
+  describe "query" do
+    it "includes the organization's assemblies" do
+      expect(subject).to include(*local_assemblies)
+    end
+
+    it "excludes the external assemblies" do
+      expect(subject).not_to include(*foreign_assemblies)
+    end
+  end
+end

data/decidim-assemblies/spec/queries/organization_prioritized_assemblies_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::OrganizationPrioritizedAssemblies do
+  subject { described_class.new(organization) }
+
+  let!(:organization) { create(:organization) }
+  let!(:local_promoted_assembly) do
+    create(:assembly,
+           :promoted,
+           organization: organization)
+  end
+
+  let!(:local_non_promoted_assembly) do
+    create(:assembly,
+           :published,
+           organization: organization)
+  end
+
+  before { create(:assembly) }
+
+  describe "query" do
+    it "orders by promoted status first" do
+      expect(subject.to_a).to eq [
+        local_promoted_assembly,
+        local_non_promoted_assembly
+      ]
+    end
+  end
+end

data/decidim-assemblies/spec/queries/organization_published_assemblies_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::OrganizationPublishedAssemblies do
+  subject { described_class.new(organization) }
+
+  let!(:organization) { create(:organization) }
+
+  let!(:published_assemblies) do
+    create_list(:assembly, 3, :published, organization: organization)
+  end
+
+  let!(:unpublished_assemblies) do
+    create_list(:assembly, 3, :unpublished, organization: organization)
+  end
+
+  let!(:foreign_assemblies) do
+    create_list(:assembly, 3, :published)
+  end
+
+  describe "query" do
+    it "includes the organization's published assemblies" do
+      expect(subject).to include(*published_assemblies)
+    end
+
+    it "excludes the organization's unpublished assemblies" do
+      expect(subject).not_to include(*unpublished_assemblies)
+    end
+
+    it "excludes other organization's published assemblies" do
+      expect(subject).not_to include(*foreign_assemblies)
+    end
+  end
+end

data/decidim-assemblies/spec/shared/assembly_administration_shared_context.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+shared_context "assembly administration" do
+  let(:organization) { create(:organization) }
+  let!(:user) { create(:user, :admin, :confirmed, organization: organization) }
+
+  let!(:assembly) { create(:assembly, organization: organization) }
+
+  let(:image1_filename) { "city.jpeg" }
+  let(:image1_path) { Decidim::Dev.asset(image1_filename) }
+  let(:image2_filename) { "city2.jpeg" }
+  let(:image2_path) { Decidim::Dev.asset(image2_filename) }
+  let(:image3_filename) { "city3.jpeg" }
+  let(:image3_path) { Decidim::Dev.asset(image3_filename) }
+end

data/decidim-assemblies/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "decidim/dev"
+
+ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
+
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
+require "decidim/dev/test/base_spec_helper"

data/decidim-budgets/app/assets/images/decidim/budgets/icon.svg

@@ -1,16 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 36 36" style="enable-background:new 0 0 36 36;" xml:space="preserve">
-<g>
-	<path d="M18,36C8.1,36,0,27.9,0,18S8.1,0,18,0s18,8.1,18,18S27.9,36,18,36z M18,2C9.2,2,2,9.2,2,18s7.2,16,16,16s16-7.2,16-16
-		S26.8,2,18,2z"/>
-</g>
-<g>
-	<g>
-		<path d="M17.1,28.3c-5.3,0-9.9-4.4-9.9-9.8c0-5.5,4.9-9.5,9.3-9.5H18v9h9v0.9C27,23.2,22.7,28.3,17.1,28.3z M16,10.7
-			c-4,0.6-6.5,3.7-6.5,7.6c0,4.3,3.6,8,7.7,8c3.9,0,7-3.3,7.6-6.3H16V10.7z"/>
-	</g>
-	<path d="M30,16H20V6h0.6c4.5,0,9.4,4.4,9.4,8.9V16z M22,14h5.5C27,11,24,8.6,22,8V14z"/>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 36 36" style="enable-background:new 0 0 36 36;" xml:space="preserve">
+  <g>
+    <path d="M18,36C8.1,36,0,27.9,0,18S8.1,0,18,0s18,8.1,18,18S27.9,36,18,36z M18,2C9.2,2,2,9.2,2,18s7.2,16,16,16s16-7.2,16-16 S26.8,2,18,2z"/>
+  </g>
+  <g>
+    <g>
+      <path d="M17.1,28.3c-5.3,0-9.9-4.4-9.9-9.8c0-5.5,4.9-9.5,9.3-9.5H18v9h9v0.9C27,23.2,22.7,28.3,17.1,28.3z M16,10.7 c-4,0.6-6.5,3.7-6.5,7.6c0,4.3,3.6,8,7.7,8c3.9,0,7-3.3,7.6-6.3H16V10.7z"/>
+    </g>
+    <path d="M30,16H20V6h0.6c4.5,0,9.4,4.4,9.4,8.9V16z M22,14h5.5C27,11,24,8.6,22,8V14z"/>
+  </g>
 </svg>

data/decidim-budgets/app/commands/decidim/budgets/add_line_item.rb

@@ -47,7 +47,7 @@ module Decidim
       end
 
       def votes_disabled?
-        !feature.active_step_settings.votes_enabled?
+        !feature.current_settings.votes_enabled?
       end
     end
   end

data/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb

@@ -32,7 +32,7 @@ module Decidim
         end
 
         def process_scope
-          current_feature.participatory_process.scope
+          current_feature.participatory_space.scope
         end
 
         def proposals

data/decidim-budgets/app/models/decidim/budgets/project.rb

@@ -11,6 +11,7 @@ module Decidim
       include Decidim::HasCategory
       include Decidim::HasAttachments
       include Decidim::HasReference
+      include Decidim::Followable
       include Decidim::Comments::Commentable
 
       feature_manifest_name "budgets"
@@ -24,7 +25,7 @@ module Decidim
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-        commentable? && !feature.active_step_settings.comments_blocked
+        commentable? && !feature.current_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_votes?` Commentable concern method.
@@ -32,15 +33,15 @@ module Decidim
         true
       end
 
+      # Public: Overrides the `users_to_notify_on_comment_created` Commentable concern method.
+      def users_to_notify_on_comment_created
+        followers
+      end
+
       # Public: Returns the number of times an specific project have been checked out.
       def confirmed_orders_count
         orders.finished.count
       end
-
-      # Public: Overrides the `notifiable?` Notifiable concern method.
-      def notifiable?(_context)
-        false
-      end
     end
   end
 end