decidim-decidim_awesome 0.8.0 → 0.12.0

data/lib/decidim/decidim_awesome/menu.rb

@@ -0,0 +1,201 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    class Menu
+      class << self
+        def register_awesome_admin_menu!
+          Decidim.menu :awesome_admin_menu do |menu|
+            menu.add_item :editors,
+                          I18n.t("menu.editors", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.config_path(:editors),
+                          position: 1,
+                          icon_name: "editors-text",
+                          if: menus[:editors]
+
+            menu.add_item :proposals,
+                          I18n.t("menu.proposals", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.config_path(:proposals),
+                          position: 2,
+                          icon_name: "documents",
+                          if: menus[:proposals]
+
+            menu.add_item :surveys,
+                          I18n.t("menu.surveys", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.config_path(:surveys),
+                          position: 3,
+                          icon_name: "surveys",
+                          if: menus[:surveys]
+
+            menu.add_item :styles,
+                          I18n.t("menu.styles", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.config_path(:scoped_styles),
+                          position: 4,
+                          icon_name: "brush",
+                          if: menus[:styles],
+                          submenu: { target_menu: :custom_styles_submenu }
+
+            menu.add_item :custom_fields,
+                          I18n.t("menu.proposal_custom_fields", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.config_path(menus[:proposal_custom_fields] ? :proposal_custom_fields : :proposal_private_custom_fields),
+                          position: 5,
+                          icon_name: "layers",
+                          active: is_active_link?(decidim_admin_decidim_awesome.config_path(:proposal_custom_fields)) ||
+                                  is_active_link?(decidim_admin_decidim_awesome.config_path(:proposal_private_custom_fields)),
+                          if: menus[:custom_fields],
+                          submenu: { target_menu: :custom_fields_submenu }
+
+            menu.add_item :admins,
+                          I18n.t("menu.admins", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.config_path(:admins),
+                          position: 6,
+                          icon_name: "group-line",
+                          if: menus[:admins]
+
+            menu.add_item :menu_hacks,
+                          I18n.t("menu.menu_hacks", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.menu_hacks_path(menus[:menu_hacks_menu] ? :menu : :home_content_block_menu),
+                          position: 7,
+                          icon_name: "menu-line",
+                          if: menus[:menu_hacks],
+                          active: is_active_link?(decidim_admin_decidim_awesome.menu_hacks_path(:menu)) ||
+                                  is_active_link?(decidim_admin_decidim_awesome.menu_hacks_path(:home_content_block_menu)),
+                          submenu: { target_menu: :menu_hacks_submenu }
+
+            menu.add_item :custom_redirects,
+                          I18n.t("menu.custom_redirects", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.custom_redirects_path,
+                          position: 8,
+                          icon_name: "external-link-line",
+                          if: menus[:custom_redirects]
+
+            menu.add_item :livechat,
+                          I18n.t("menu.livechat", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.config_path(:livechat),
+                          position: 9,
+                          icon_name: "chat-1-line",
+                          if: menus[:livechat]
+
+            menu.add_item :verifications,
+                          I18n.t("menu.verifications", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.config_path(:verifications),
+                          position: 10,
+                          icon_name: "fingerprint-line",
+                          if: menus[:verifications]
+
+            menu.add_item :maintenance,
+                          I18n.t("maintenance", scope: "decidim.decidim_awesome.admin.menu.maintenance"),
+                          decidim_admin_decidim_awesome.maintenance_path(:private_data),
+                          position: 11,
+                          icon_name: "tools-line",
+                          active: is_active_link?(decidim_admin_decidim_awesome.maintenance_path(:private_data)) ||
+                                  is_active_link?(decidim_admin_decidim_awesome.checks_maintenance_index_path),
+                          submenu: { target_menu: :maintenance_submenu }
+          end
+        end
+
+        def register_custom_fields_submenu!
+          Decidim.menu :custom_fields_submenu do |menu|
+            menu.add_item :proposal_custom_fields,
+                          I18n.t("menu.title", scope: "decidim.decidim_awesome.admin.proposal_custom_fields"),
+                          decidim_admin_decidim_awesome.config_path(:proposal_custom_fields),
+                          position: 5.1,
+                          icon_name: "draft-line",
+                          if: menus[:proposal_custom_fields]
+
+            menu.add_item :proposal_private_custom_fields,
+                          I18n.t("proposal_private_custom_fields", scope: "decidim.decidim_awesome.admin.proposal_custom_fields"),
+                          decidim_admin_decidim_awesome.config_path(:proposal_private_custom_fields),
+                          position: 5.2,
+                          icon_name: "spy",
+                          if: menus[:proposal_private_custom_fields]
+          end
+        end
+
+        def register_custom_styles_submenu!
+          Decidim.menu :custom_styles_submenu do |menu|
+            menu.add_item :scoped_styles,
+                          I18n.t("menu.title", scope: "decidim.decidim_awesome.admin.scoped_styles"),
+                          decidim_admin_decidim_awesome.config_path(:scoped_styles),
+                          position: 4.1,
+                          icon_name: "computer-line",
+                          if: config_enabled?(:scoped_styles)
+
+            menu.add_item :scoped_admin_styles,
+                          I18n.t("menu.title", scope: "decidim.decidim_awesome.admin.scoped_admin_styles"),
+                          decidim_admin_decidim_awesome.config_path(:scoped_admin_styles),
+                          position: 4.2,
+                          icon_name: "file-settings-line",
+                          if: config_enabled?(:scoped_admin_styles)
+          end
+        end
+
+        def register_menu_hacks_submenu!
+          Decidim.menu :menu_hacks_submenu do |menu|
+            menu.add_item :main_menu,
+                          I18n.t("menu.title", scope: "decidim.decidim_awesome.admin.menu_hacks.index"),
+                          decidim_admin_decidim_awesome.menu_hacks_path(:menu),
+                          position: 7.1,
+                          icon_name: "global-line",
+                          if: menus[:menu_hacks_menu]
+
+            menu.add_item :content_block_main_menu,
+                          I18n.t("home_content_block_menu.title", scope: "decidim.decidim_awesome.admin.menu_hacks.index"),
+                          decidim_admin_decidim_awesome.menu_hacks_path(:home_content_block_menu),
+                          position: 7.2,
+                          icon_name: "layout-masonry-line",
+                          if: menus[:menu_hacks_home_content_block_menu]
+          end
+        end
+
+        def register_maintenance_admin_menu!
+          Decidim.menu :maintenance_submenu do |menu|
+            menu.add_item :private_data,
+                          I18n.t("private_data", scope: "decidim.decidim_awesome.admin.menu.maintenance"),
+                          decidim_admin_decidim_awesome.maintenance_path(:private_data),
+                          position: 10,
+                          icon_name: "spy-line"
+
+            menu.add_item :checks,
+                          I18n.t("checks", scope: "decidim.decidim_awesome.admin.menu.maintenance"),
+                          decidim_admin_decidim_awesome.checks_maintenance_index_path,
+                          position: 10,
+                          icon_name: "pulse"
+          end
+        end
+
+        def menus
+          @menus ||= {
+            editors: config_enabled?(:allow_images_in_editors, :allow_videos_in_editors),
+            proposals: config_enabled?(
+              :allow_images_in_proposals,
+              :validate_title_min_length, :validate_title_max_caps_percent,
+              :validate_title_max_marks_together, :validate_title_start_with_caps,
+              :validate_body_min_length, :validate_body_max_caps_percent,
+              :validate_body_max_marks_together, :validate_body_start_with_caps
+            ),
+            surveys: config_enabled?(:auto_save_forms, :user_timezone),
+            styles: config_enabled?(:scoped_styles, :scoped_admin_styles),
+            scoped_styles: config_enabled?(:scoped_styles),
+            scoped_admin_styles: config_enabled?(:scoped_admin_styles),
+            custom_fields: config_enabled?(:proposal_custom_fields, :proposal_private_custom_fields),
+            proposal_custom_fields: config_enabled?(:proposal_custom_fields),
+            proposal_private_custom_fields: config_enabled?(:proposal_private_custom_fields),
+            admins: config_enabled?(:scoped_admins),
+            menu_hacks: config_enabled?(:menu, :home_content_block_menu),
+            menu_hacks_menu: config_enabled?(:menu),
+            menu_hacks_home_content_block_menu: config_enabled?(:home_content_block_menu),
+            custom_redirects: config_enabled?(:custom_redirects),
+            livechat: config_enabled?(:intergram_for_admins, :intergram_for_public),
+            verifications: config_enabled?(:force_authorization_after_login)
+          }
+        end
+
+        # ensure boolean value
+        def config_enabled?(*vars)
+          DecidimAwesome.enabled?(*vars)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/decidim_awesome/menu_hacker.rb

@@ -21,6 +21,7 @@ module Decidim
           default = default_items.find { |i| i.url.gsub(/\?.*/, "") == item.url }
           if default
             item.send("overrided?=", true)
+            item[:original_active] = default.active
             @items.reject! { |i| i.url.gsub(/\?.*/, "") == item.url }
           end
           @items << item
@@ -36,10 +37,7 @@ module Decidim
       attr_reader :name, :view
 
       def default_items
-        @default_items ||= build_menu.instance_variable_get(:@items).map do |item|
-          item.instance_variable_set(:@active, method(:activate?)) unless item.active == :exact
-          item
-        end
+        @default_items ||= build_menu.items
       end
 
       def build_menu
@@ -78,13 +76,17 @@ module Decidim
           user.present?
         when "non_logged"
           user.blank?
+        when "verified_user"
+          # the cleaner version should be user.authorizations.any?
+          # but there is not relationship between users and authorizations
+          Decidim::Authorization.where(user:).any? { |auth| auth.granted? && !auth.expired? }
         else
           true
         end
       end
 
       def current_config
-        @current_config ||= (AwesomeConfig.find_by(var: name, organization: organization)&.value || []).filter { |i| i.is_a? Hash }
+        @current_config ||= (AwesomeConfig.find_by(var: name, organization:)&.value || []).filter { |i| i.is_a? Hash }
       end
     end
   end

data/{app/middleware/decidim/decidim_awesome → lib/decidim/decidim_awesome/middleware}/current_config.rb

@@ -85,6 +85,7 @@ module Decidim
         end.flatten.uniq.map(&:to_i)
       end
 
+      # rubocop:disable Lint/DuplicateBranch
       # avoid unnecessary processing for non-user routes
       def processable_path?
         return true if safe_get_route?
@@ -99,7 +100,7 @@ module Decidim
       end
 
       def safe_get_route?
-        return unless @request.get?
+        return false unless @request.get?
 
         case @request.path
         when "/"
@@ -114,13 +115,14 @@ module Decidim
       end
 
       def safe_post_route?
-        return unless @request.post? || @request.put? || @request.patch?
+        return false unless @request.post? || @request.put? || @request.patch?
 
         case @request.path
         when %r{^/admin/admin_terms}
           true
         end
       end
+      # rubocop:enable Lint/DuplicateBranch
 
       # to access certain deeper routes it requires first to click on a parent route, even without Post permissions in there
       # this adds this additional routes to these cases
@@ -168,7 +170,7 @@ module Decidim
           next unless model
 
           settings["participatory_space_slug"] = model.find_by(slug: settings["participatory_space_slug"])&.id
-          OpenStruct.new(settings: settings) if settings["participatory_space_slug"]
+          OpenStruct.new(settings:) if settings["participatory_space_slug"]
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity

data/lib/decidim/decidim_awesome/request_memoizer.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module RequestMemoizer
+      # memoize a piece of code in the global request instead of the helper instance (helpers are initialized for each view)
+      def memoize(key)
+        if defined?(request) && request.env["decidim.current_organization"]&.id
+          request.env["decidim_awesome.#{key}"] ||= block_given? ? yield : nil
+        elsif block_given?
+          yield
+        end
+      end
+    end
+  end
+end

data/lib/decidim/decidim_awesome/system_checker.rb

@@ -24,8 +24,8 @@ module Decidim
 
         delegate :to_h, to: :overrides
 
-        def each(&block)
-          to_h.each(&block)
+        def each(&)
+          to_h.each(&)
         end
 
         def each_file
@@ -36,6 +36,10 @@ module Decidim
           end
         end
 
+        def exists?(spec, file)
+          File.exist?("#{spec.gem_dir}#{file}")
+        end
+
         def valid?(spec, file)
           find_signatures("#{spec.gem_dir}#{file}").detect { |s| md5("#{spec.gem_dir}#{file}") == s }
         end

data/lib/decidim/decidim_awesome/test/factories.rb

@@ -1,36 +1,58 @@
 # frozen_string_literal: true
 
-require "decidim/core/test/factories"
-require "decidim/proposals/test/factories"
-
 FactoryBot.define do
   factory :awesome_config, class: "Decidim::DecidimAwesome::AwesomeConfig" do
     var { Faker::Hacker.noun }
     value { Decidim::DecidimAwesome.config.to_a.sample(1).to_h }
-    organization { create :organization }
+    organization
   end
 
   factory :config_constraint, class: "Decidim::DecidimAwesome::ConfigConstraint" do
     settings { { Faker::Hacker.noun => Faker::Hacker.noun } }
-    awesome_config { create :awesome_config }
+    awesome_config
   end
 
   factory :awesome_editor_image, class: "Decidim::DecidimAwesome::EditorImage" do
     file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     path { Faker::Internet.url(host: "", scheme: "") }
-    author { create :user }
-    organization { create :organization }
+    author { association :user }
+    organization
+  end
+
+  factory :paper_trail_version, class: "Decidim::DecidimAwesome::PaperTrailVersion" do
+    item_id { user.id }
+    item_type { "Decidim::ParticipatoryProcessUserRole" }
+    event { "create" }
+    created_at { 1.hour.ago }
   end
 
   factory :map_component, parent: :component do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :proposals).i18n_name }
     manifest_name { :awesome_map }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { association(:participatory_process, :with_steps, organization:) }
   end
 
   factory :iframe_component, parent: :component do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :proposals).i18n_name }
     manifest_name { :awesome_iframe }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { association(:participatory_process, :with_steps, organization:) }
+  end
+
+  factory :awesome_vote_weight, class: "Decidim::DecidimAwesome::VoteWeight" do
+    vote { association(:proposal_vote) }
+    sequence(:weight) { |n| n }
+  end
+
+  factory :awesome_proposal_extra_fields, class: "Decidim::DecidimAwesome::ProposalExtraField" do
+    proposal
+
+    trait :with_votes do
+      after :create do |weight|
+        5.times.collect do |n|
+          vote = create(:proposal_vote, proposal: weight.proposal, author: create(:user, organization: weight.proposal.organization))
+          create(:awesome_vote_weight, vote:, weight: n + 1)
+        end
+      end
+    end
   end
 end

data/lib/decidim/decidim_awesome/test/initializer.rb

@@ -1,21 +1,37 @@
 # frozen_string_literal: true
 
 Decidim::DecidimAwesome.configure do |config|
-  if ENV["FEATURES"] == "disabled"
+  if ENV.fetch("FEATURES", nil) == "disabled"
     [
-      :allow_images_in_full_editor,
-      :allow_images_in_small_editor,
+      :allow_images_in_editors,
+      :allow_videos_in_editors,
       :allow_images_in_proposals,
-      :use_markdown_editor,
-      :allow_images_in_markdown_editor,
       :auto_save_forms,
+      :user_timezone,
+      :force_authorization_after_login,
+      :admins_available_authorizations,
       :intergram_for_admins,
       :intergram_for_public,
       :scoped_styles,
+      :scoped_admin_styles,
       :proposal_custom_fields,
+      :proposal_private_custom_fields,
       :menu,
+      :home_content_block_menu,
       :scoped_admins,
-      :custom_redirects
+      :custom_redirects,
+      :validate_title_min_length,
+      :validate_title_max_caps_percent,
+      :validate_title_max_marks_together,
+      :validate_title_start_with_caps,
+      :validate_body_min_length,
+      :validate_body_max_caps_percent,
+      :validate_body_max_marks_together,
+      :validate_body_start_with_caps,
+      :weighted_proposal_voting,
+      :additional_proposal_sortings,
+      :allow_limiting_amendments,
+      :proposal_private_custom_fields
     ].each do |conf|
       config.send("#{conf}=", :disabled)
     end

data/lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb

@@ -18,11 +18,11 @@
 <meta property="og:image" content="<%= decidim_meta_image_url %>">
 
 <%= favicon %>
-<%= stylesheet_pack_tag "decidim_core", media: "all" %>
+<%= append_stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>
 
 <%= organization_colors %>
-<%= javascript_pack_tag "decidim_core", defer: false %>
+<%= append_javascript_pack_tag "decidim_core", defer: false %>
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>

data/lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb

@@ -2,7 +2,7 @@
 <%= csrf_meta_tags %>
 <%= organization_colors %>
 
-<%= stylesheet_pack_tag "decidim_admin", media: "all" %>
-<%= javascript_pack_tag "decidim_admin", defer: false %>
+<%= append_stylesheet_pack_tag "decidim_admin", media: "all" %>
+<%= append_javascript_pack_tag "decidim_admin", defer: false %>
 
 <%= snippets.display(:head) %>

data/lib/decidim/decidim_awesome/test/shared_examples/action_log_presenter_examples.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+shared_examples "a user presenter" do
+  describe "#last_sign_in_date" do
+    it "returns never logged in yet" do
+      expect(subject.last_sign_in_date).to eq("<span class=\"muted\">Never logged yet</span>")
+    end
+
+    context "when no html" do
+      let(:html) { false }
+
+      it "returns never logged in yet" do
+        expect(subject.last_sign_in_date).to eq("Never logged yet")
+      end
+    end
+
+    context "when user has logged before" do
+      let(:last_sign_in_at) { 1.day.ago }
+
+      it "returns the last sign in date" do
+        expect(subject.last_sign_in_date).to eq(1.day.ago.strftime("%d/%m/%Y %H:%M"))
+      end
+    end
+  end
+
+  describe "#user" do
+    it "returns the user" do
+      expect(subject.user).to eq(user)
+    end
+
+    it "returns email" do
+      expect(subject.user_email).to eq(user.email)
+    end
+
+    it "returns user name" do
+      expect(subject.user_name).to eq(user.name)
+    end
+  end
+
+  describe "#removal_date" do
+    it "returns currently active" do
+      expect(subject.removal_date).to eq("<span class=\"text-success\">Currently active</span>")
+    end
+
+    context "when html is disabled" do
+      let(:html) { false }
+
+      it "returns currently active" do
+        expect(subject.removal_date).to eq("Currently active")
+      end
+    end
+
+    context "when the role was removed" do
+      include_context "with role destroyed"
+
+      it "returns the removal date" do
+        expect(subject.removal_date).to eq(destroyed_at.strftime("%d/%m/%Y %H:%M"))
+      end
+    end
+  end
+end

data/lib/decidim/decidim_awesome/test/shared_examples/{box_label_editor.rb → box_label_editor_examples.rb}

@@ -5,33 +5,33 @@ shared_examples "edits box label inline" do |test_case, key|
 
   it "updates the label when no changes" do
     link = find("[data-key=#{key}] a.awesome-auto-edit", match: :first)
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).to have_no_field(class: "awesome-auto-edit")
     link.click
-    expect(page).to have_css("input.awesome-auto-edit")
+    expect(page).to have_field(class: "awesome-auto-edit")
     find("body").click
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).to have_no_field(class: "awesome-auto-edit")
     link.click
     input = find("[data-key=#{key}] input.awesome-auto-edit")
     input.fill_in with: "A new làbel\n"
     sleep 1
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).to have_no_field(class: "awesome-auto-edit")
     expect(page).to have_css("span.awesome-auto-edit[data-key=a_new_label]")
 
-    find("*[type=submit]").click
+    click_link_or_button "Update configuration"
     case test_case
     when :css
       expect(page).to have_content("body {background: red;}")
     when :fields
       expect(page).to have_content("Occupation")
       expect(page).to have_content("Street Sweeper")
-      expect(page).not_to have_content("Short Bio")
+      expect(page).to have_no_content("Short Bio")
     when :admins
-      expect(page).not_to have_content(user.name.to_s)
+      expect(page).to have_no_content(user.name.to_s)
       expect(page).to have_content(user2.name.to_s)
       expect(page).to have_content(user3.name.to_s)
     end
     expect(page).to have_css("span.awesome-auto-edit[data-key=a_new_label]")
-    expect(page).not_to have_css("span.awesome-auto-edit[data-key=#{key}]")
+    expect(page).to have_no_css("span.awesome-auto-edit[data-key=#{key}]")
   end
 
   it "updates the label with previous changes" do
@@ -48,19 +48,19 @@ shared_examples "edits box label inline" do |test_case, key|
     end
 
     link = find("[data-key=#{key}] a.awesome-auto-edit", match: :first)
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).to have_no_field(class: "awesome-auto-edit")
     link.click
-    expect(page).to have_css("input.awesome-auto-edit")
+    expect(page).to have_field(class: "awesome-auto-edit")
     find("body").click
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).to have_no_field(class: "awesome-auto-edit")
     link.click
     input = find("[data-key=#{key}] input.awesome-auto-edit")
     input.fill_in with: "A new làbel\n"
     sleep 1
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).to have_no_field(class: "awesome-auto-edit")
     expect(page).to have_css("span.awesome-auto-edit[data-key=a_new_label]")
 
-    find("*[type=submit]").click
+    click_link_or_button "Update configuration"
     case test_case
     when :css
       expect(page).to have_admin_callout("updated successfully")
@@ -73,44 +73,44 @@ shared_examples "edits box label inline" do |test_case, key|
       expect(page).to have_content(user3.name.to_s)
     end
     expect(page).to have_css("span.awesome-auto-edit[data-key=a_new_label]")
-    expect(page).not_to have_css("span.awesome-auto-edit[data-key=#{key}]")
+    expect(page).to have_no_css("span.awesome-auto-edit[data-key=#{key}]")
   end
 
   it "updates the label with post changes" do
     link = find("[data-key=#{key}] a.awesome-auto-edit", match: :first)
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).to have_no_field(class: "awesome-auto-edit")
     link.click
-    expect(page).to have_css("input.awesome-auto-edit")
+    expect(page).to have_field(class: "awesome-auto-edit")
     find("body").click
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).to have_no_field(class: "awesome-auto-edit")
     link.click
     input = find("[data-key=#{key}] input.awesome-auto-edit")
     input.fill_in with: "A new làbel\n"
     sleep 1
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).to have_no_field(class: "awesome-auto-edit")
     expect(page).to have_css("span.awesome-auto-edit[data-key=a_new_label]")
 
     case test_case
     when :css
       sleep 1
       page.execute_script('document.querySelector("[data-key=a_new_label] .CodeMirror").CodeMirror.setValue("body {background: lilac;}");')
-      find("*[type=submit]").click
+      click_link_or_button "Update configuration"
       expect(page).to have_admin_callout("updated successfully")
       expect(page).to have_content("body {background: lilac;}")
     when :fields
       expect(page).to have_content("Full Name")
       sleep 2
       page.execute_script("$('.proposal_custom_fields_container[data-key=a_new_label] .proposal_custom_fields_editor')[0].FormBuilder.actions.setData(#{data})")
-      find("*[type=submit]").click
+      click_link_or_button "Update configuration"
       expect(page).to have_content("Short Name")
     when :admins
       page.execute_script("$('.multiusers-select:first').append(new Option('#{user.name}', #{user.id}, true, true)).trigger('change');")
-      find("*[type=submit]").click
+      click_link_or_button "Update configuration"
       expect(page).to have_content(user.name.to_s)
       expect(page).to have_content(user2.name.to_s)
       expect(page).to have_content(user3.name.to_s)
     end
     expect(page).to have_css("span.awesome-auto-edit[data-key=a_new_label]")
-    expect(page).not_to have_css("span.awesome-auto-edit[data-key=#{key}]")
+    expect(page).to have_no_css("span.awesome-auto-edit[data-key=#{key}]")
   end
 end