decidim-dev 0.27.4 → 0.28.0.rc5

data/lib/decidim/dev/test/rspec_support/capybara.rb

@@ -6,7 +6,7 @@ module Decidim
   # Helpers meant to be used only during capybara test runs.
   module CapybaraTestHelpers
     def switch_to_host(host = "lvh.me")
-      raise "Can't switch to a custom host unless it really exists. Use `whatever.lvh.me` as a workaround." unless /lvh\.me$/.match?(host)
+      raise "Cannot switch to a custom host unless it really exists. Use `whatever.lvh.me` as a workaround." unless /lvh\.me$/.match?(host)
 
       app_host = (host ? "#{protocol}://#{host}" : nil)
       Capybara.app_host = app_host
@@ -28,8 +28,20 @@ module Decidim
   end
 end
 
+1.step do
+  port = rand(5000..6999)
+  begin
+    Socket.tcp("127.0.0.1", port, connect_timeout: 5).close
+  rescue Errno::ECONNREFUSED
+    # When connection is refused, the port is available for use.
+    Capybara.server_port = port
+    break
+  end
+end
+
 Capybara.register_driver :headless_chrome do |app|
-  options = ::Selenium::WebDriver::Chrome::Options.new
+  options = Selenium::WebDriver::Chrome::Options.new
+  options.args << "--explicitly-allowed-ports=#{Capybara.server_port}"
   options.args << "--headless"
   options.args << "--no-sandbox"
   options.args << if ENV["BIG_SCREEN_SIZE"].present?
@@ -41,27 +53,20 @@ Capybara.register_driver :headless_chrome do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :chrome,
-    capabilities: [options]
+    options:
   )
 end
 
-1.step do
-  port = rand(5000..6999)
-  begin
-    Socket.tcp("127.0.0.1", port, connect_timeout: 5).close
-  rescue Errno::ECONNREFUSED
-    # When connection is refused, the port is available for use.
-    Capybara.server_port = port
-    break
-  end
-end
-
-# In order to work with PWA apps, Chrome can't be run in headless mode, and requires
+# In order to work with PWA apps, Chrome cannot be run in headless mode, and requires
 # setting up special prefs and flags
 Capybara.register_driver :pwa_chrome do |app|
-  options = ::Selenium::WebDriver::Chrome::Options.new
+  options = Selenium::WebDriver::Chrome::Options.new
+  options.args << "--explicitly-allowed-ports=#{Capybara.server_port}"
+  # If we have a headless browser things like the offline navigation feature stop working,
+  # so we need to have have a headful/recapitated (aka not headless) browser for these specs
+  # options.args << "--headless"
   options.args << "--no-sandbox"
-  # Don't limit browser resources
+  # Do not limit browser resources
   options.args << "--disable-dev-shm-usage"
   # Add pwa.lvh.me host as a secure origin
   options.args << "--unsafely-treat-insecure-origin-as-secure=http://pwa.lvh.me:#{Capybara.server_port}"
@@ -80,12 +85,12 @@ Capybara.register_driver :pwa_chrome do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :chrome,
-    capabilities: [options]
+    options:
   )
 end
 
 Capybara.register_driver :iphone do |app|
-  options = ::Selenium::WebDriver::Chrome::Options.new
+  options = Selenium::WebDriver::Chrome::Options.new
   options.args << "--headless"
   options.args << "--no-sandbox"
   options.add_emulation(device_name: "iPhone 6")
@@ -93,7 +98,7 @@ Capybara.register_driver :iphone do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :chrome,
-    capabilities: [options]
+    options:
   )
 end
 
@@ -125,7 +130,7 @@ RSpec.configure do |config|
       domain = ".#{domain}" unless domain == "localhost"
       page.driver.browser.execute_cdp(
         "Network.setCookie",
-        domain: domain,
+        domain:,
         name: Decidim.consent_cookie_name,
         value: { essential: true }.to_json,
         path: "/",

data/lib/decidim/dev/test/rspec_support/cell_matchers.rb

@@ -4,7 +4,7 @@ module Decidim
   module CellMatchers
     RSpec::Matchers.define :render_nothing do |_expected_value|
       match do |actual_value|
-        expect(actual_value).to have_no_selector("html")
+        expect(actual_value).not_to have_selector("html")
       end
 
       diffable

data/lib/decidim/dev/test/rspec_support/component.rb

@@ -2,323 +2,13 @@
 
 require "decidim/component_validator"
 require "decidim/comments"
-
-module Decidim
-  class DummyResourceEvent < Events::BaseEvent
-    include Decidim::Events::EmailEvent
-    include Decidim::Events::NotificationEvent
-  end
-
-  module DummyResources
-    include ActiveSupport::Configurable
-
-    # Settings needed to compare emendations in Decidim::SimilarEmendations
-    config_accessor :similarity_threshold do
-      0.25
-    end
-    config_accessor :similarity_limit do
-      10
-    end
-
-    # Dummy engine to be able to test components.
-    class DummyEngine < Rails::Engine
-      engine_name "dummy"
-      isolate_namespace Decidim::DummyResources
-
-      routes do
-        root to: proc { [200, {}, ["DUMMY ENGINE"]] }
-
-        resources :dummy_resources do
-          resources :nested_dummy_resources
-          get :foo, on: :member
-        end
-      end
-    end
-
-    class DummyAdminEngine < Rails::Engine
-      engine_name "dummy_admin"
-
-      routes do
-        resources :dummy_resources do
-          resources :nested_dummy_resources
-        end
-
-        root to: proc { [200, {}, ["DUMMY ADMIN ENGINE"]] }
-      end
-
-      initializer "dummy_admin.imports" do
-        class ::DummyCreator < Decidim::Admin::Import::Creator
-          def self.resource_klass
-            Decidim::DummyResources::DummyResource
-          end
-
-          def produce
-            resource
-          end
-
-          private
-
-          def resource
-            @resource ||= Decidim::DummyResources::DummyResource.new(
-              title: { en: "Dummy" },
-              author: context[:current_user],
-              component: component
-            )
-          end
-
-          def component
-            context[:current_component]
-          end
-        end
-      end
-    end
-
-    class ApplicationRecord < ActiveRecord::Base
-      self.abstract_class = true
-    end
-
-    class DummyResource < ApplicationRecord
-      include HasComponent
-      include HasReference
-      include Resourceable
-      include Reportable
-      include Authorable
-      include HasCategory
-      include ScopableResource
-      include Decidim::Comments::Commentable
-      include Followable
-      include Traceable
-      include Publicable
-      include Decidim::DownloadYourData
-      include Searchable
-      include Paddable
-      include Amendable
-      include Decidim::NewsletterParticipant
-      include ::Decidim::Endorsable
-      include Decidim::HasAttachments
-      include Decidim::ShareableWithToken
-      include Decidim::TranslatableResource
-
-      translatable_fields :title
-      searchable_fields(
-        scope_id: { scope: :id },
-        participatory_space: { component: :participatory_space },
-        A: [:title],
-        D: [:address],
-        datetime: :published_at
-      )
-
-      amendable(
-        fields: [:title],
-        form: "Decidim::DummyResources::DummyResourceForm"
-      )
-
-      component_manifest_name "dummy"
-
-      def reported_content_url
-        ResourceLocatorPresenter.new(self).url
-      end
-
-      def reported_attributes
-        [:title]
-      end
-
-      def reported_searchable_content_extras
-        [normalized_author.name]
-      end
-
-      def allow_resource_permissions?
-        component.settings.resources_permissions_enabled
-      end
-
-      # Public: Overrides the `commentable?` Commentable concern method.
-      def commentable?
-        component.settings.comments_enabled?
-      end
-
-      # Public: Whether the object can have new comments or not.
-      def user_allowed_to_comment?(user)
-        component.can_participate_in_space?(user)
-      end
-
-      # Public: Whether the object can have new comment votes or not.
-      def user_allowed_to_vote_comment?(user)
-        component.can_participate_in_space?(user)
-      end
-
-      def self.user_collection(user)
-        where(decidim_author_id: user.id, decidim_author_type: "Decidim::User")
-      end
-
-      def self.export_serializer
-        DummySerializer
-      end
-
-      def self.newsletter_participant_ids(component)
-        authors_ids = Decidim::DummyResources::DummyResource.where(component: component)
-                                                            .where(decidim_author_type: Decidim::UserBaseEntity.name)
-                                                            .where.not(author: nil)
-                                                            .group(:decidim_author_id)
-                                                            .pluck(:decidim_author_id)
-        commentators_ids = Decidim::Comments::Comment.user_commentators_ids_in(Decidim::DummyResources::DummyResource.where(component: component))
-        (authors_ids + commentators_ids).flatten.compact.uniq
-      end
-    end
-
-    class NestedDummyResource < ApplicationRecord
-      include Decidim::Resourceable
-      belongs_to :dummy_resource
-    end
-
-    class CoauthorableDummyResource < ApplicationRecord
-      include ::Decidim::Coauthorable
-      include HasComponent
-    end
-
-    class OfficialAuthorPresenter
-      def name
-        self.class.name
-      end
-
-      def nickname
-        UserBaseEntity.nicknamize(name)
-      end
-
-      def deleted?
-        false
-      end
-
-      def respond_to_missing?(*)
-        true
-      end
-
-      def method_missing(method, *args)
-        if method.to_s.ends_with?("?")
-          false
-        elsif [:avatar_url, :profile_path, :badge, :followers_count, :cache_key_with_version].include?(method)
-          ""
-        else
-          super
-        end
-      end
-    end
-  end
-end
-
-class DummySerializer
-  def initialize(id)
-    @id = id
-  end
-
-  def run
-    serialize
-  end
-
-  def serialize
-    {
-      id: @id
-    }
-  end
-end
-
-Decidim.register_component(:dummy) do |component|
-  component.engine = Decidim::DummyResources::DummyEngine
-  component.admin_engine = Decidim::DummyResources::DummyAdminEngine
-  component.icon = "media/images/decidim_dev_dummy.svg"
-
-  component.actions = %w(foo bar)
-
-  component.newsletter_participant_entities = ["Decidim::DummyResources::DummyResource"]
-
-  component.settings(:global) do |settings|
-    settings.attribute :scopes_enabled, type: :boolean, default: false
-    settings.attribute :scope_id, type: :scope
-    settings.attribute :comments_enabled, type: :boolean, default: true
-    settings.attribute :comments_max_length, type: :integer, required: false
-    settings.attribute :resources_permissions_enabled, type: :boolean, default: true
-    settings.attribute :dummy_global_attribute1, type: :boolean
-    settings.attribute :dummy_global_attribute2, type: :boolean, readonly: ->(_context) { false }
-    settings.attribute :readonly_attribute, type: :boolean, default: true, readonly: ->(_context) { true }
-    settings.attribute :enable_pads_creation, type: :boolean, default: false
-    settings.attribute :amendments_enabled, type: :boolean, default: false
-    settings.attribute :dummy_global_translatable_text, type: :text, translated: true, editor: true, required: true
-  end
-
-  component.settings(:step) do |settings|
-    settings.attribute :comments_blocked, type: :boolean, default: false
-    settings.attribute :dummy_step_attribute1, type: :boolean
-    settings.attribute :dummy_step_attribute2, type: :boolean, readonly: ->(_context) { false }
-    settings.attribute :dummy_step_translatable_text, type: :text, translated: true, editor: true, required: true
-    settings.attribute :readonly_step_attribute, type: :boolean, default: true, readonly: ->(_context) { true }
-    settings.attribute :amendment_creation_enabled, type: :boolean, default: true
-    settings.attribute :amendment_reaction_enabled, type: :boolean, default: true
-    settings.attribute :amendment_promotion_enabled, type: :boolean, default: true
-    settings.attribute :amendments_visibility, type: :string, default: "all"
-    settings.attribute :endorsements_enabled, type: :boolean, default: false
-    settings.attribute :endorsements_blocked, type: :boolean, default: false
-  end
-
-  component.register_resource(:dummy_resource) do |resource|
-    resource.name = :dummy
-    resource.model_class_name = "Decidim::DummyResources::DummyResource"
-    resource.template = "decidim/dummy_resource/linked_dummys"
-    resource.actions = %w(foo)
-    resource.searchable = true
-  end
-
-  component.register_resource(:nested_dummy_resource) do |resource|
-    resource.name = :nested_dummy
-    resource.model_class_name = "Decidim::DummyResources::NestedDummyResource"
-  end
-
-  component.register_resource(:coauthorable_dummy_resource) do |resource|
-    resource.name = :coauthorable_dummy
-    resource.model_class_name = "Decidim::DummyResources::CoauthorableDummyResource"
-    resource.template = "decidim/coauthorabledummy_resource/linked_dummys"
-    resource.actions = %w(foo-coauthorable)
-    resource.searchable = false
-  end
-
-  component.register_stat :dummies_count_high, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, _start_at, _end_at|
-    components.count * 10
-  end
-
-  component.register_stat :dummies_count_medium, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, _start_at, _end_at|
-    components.count * 100
-  end
-
-  component.exports :dummies do |exports|
-    exports.collection do
-      [1, 2, 3]
-    end
-
-    exports.serializer DummySerializer
-  end
-
-  component.imports :dummies do |imports|
-    imports.messages do |msg|
-      msg.set(:resource_name) { |count: 1| count == 1 ? "Dummy" : "Dummies" }
-      msg.set(:title) { "Import dummies" }
-      msg.set(:label) { "Import dummies from a file" }
-    end
-
-    imports.creator DummyCreator
-    imports.example do |import_component|
-      locales = import_component.organization.available_locales
-      translated = ->(name) { locales.map { |l| "#{name}/#{l}" } }
-      [
-        translated.call("title") + %w(body) + translated.call("translatable_text") + %w(address latitude longitude),
-        locales.map { "Title text" } + ["Body text"] + locales.map { "Translatable text" } + ["Fake street 1", 1.0, 1.0]
-      ]
-    end
-  end
-end
+require "decidim/dev"
 
 RSpec.configure do |config|
   config.before(:suite) do
     ActiveRecord::Migration.suppress_messages do
-      unless ActiveRecord::Base.connection.data_source_exists?("decidim_dummy_resources_dummy_resources")
-        ActiveRecord::Migration.create_table :decidim_dummy_resources_dummy_resources do |t|
+      unless ActiveRecord::Base.connection.data_source_exists?("decidim_dev_dummy_resources")
+        ActiveRecord::Migration.create_table :decidim_dev_dummy_resources do |t|
           t.jsonb :translatable_text
           t.jsonb :title
           t.string :body
@@ -342,8 +32,8 @@ RSpec.configure do |config|
           t.timestamps
         end
       end
-      unless ActiveRecord::Base.connection.data_source_exists?("decidim_dummy_resources_nested_dummy_resources")
-        ActiveRecord::Migration.create_table :decidim_dummy_resources_nested_dummy_resources do |t|
+      unless ActiveRecord::Base.connection.data_source_exists?("decidim_dev_nested_dummy_resources")
+        ActiveRecord::Migration.create_table :decidim_dev_nested_dummy_resources do |t|
           t.jsonb :translatable_text
           t.string :title
 
@@ -351,8 +41,8 @@ RSpec.configure do |config|
           t.timestamps
         end
       end
-      unless ActiveRecord::Base.connection.data_source_exists?("decidim_dummy_resources_coauthorable_dummy_resources")
-        ActiveRecord::Migration.create_table :decidim_dummy_resources_coauthorable_dummy_resources do |t|
+      unless ActiveRecord::Base.connection.data_source_exists?("decidim_dev_coauthorable_dummy_resources")
+        ActiveRecord::Migration.create_table :decidim_dev_coauthorable_dummy_resources do |t|
           t.jsonb :translatable_text
           t.string :title
           t.string :body

data/lib/decidim/dev/test/rspec_support/component_context.rb

@@ -15,31 +15,31 @@ shared_examples "has mandatory config setting" do |mandatory_field|
     click_button "Update"
 
     within ".#{mandatory_field}_container" do
-      expect(page).to have_content("There's an error in this field")
+      expect(page).to have_content("There is an error in this field")
     end
   end
 end
 
 shared_context "with a component" do
   let(:manifest) { Decidim.find_component_manifest(manifest_name) }
-  let(:user) { create :user, :confirmed, organization: organization }
+  let(:user) { create :user, :confirmed, organization: }
 
   let!(:organization) { create(:organization, *organization_traits, available_authorizations: %w(dummy_authorization_handler another_dummy_authorization_handler)) }
 
   let(:participatory_process) do
-    create(:participatory_process, :with_steps, organization: organization)
+    create(:participatory_process, :with_steps, organization:)
   end
 
   let(:participatory_space) { participatory_process }
 
   let!(:component) do
     create(:component,
-           manifest: manifest,
-           participatory_space: participatory_space)
+           manifest:,
+           participatory_space:)
   end
 
-  let!(:category) { create :category, participatory_space: participatory_space }
-  let!(:scope) { create :scope, organization: organization }
+  let!(:category) { create :category, participatory_space: }
+  let!(:scope) { create :scope, organization: }
 
   let(:organization_traits) { [] }
 
@@ -94,7 +94,7 @@ shared_context "when managing a component as an admin" do
     create :user,
            :admin,
            :confirmed,
-           organization: organization
+           organization:
   end
 end
 
@@ -104,7 +104,7 @@ shared_context "when managing a component as a process admin" do
   let(:user) do
     create :process_admin,
            :confirmed,
-           organization: organization,
-           participatory_process: participatory_process
+           organization:,
+           participatory_process:
   end
 end

data/lib/decidim/dev/test/rspec_support/confirmation_helpers.rb

@@ -7,15 +7,17 @@ module ConfirmationHelpers
   #
   # See:
   # https://github.com/teamcapybara/capybara/blob/44621209496fe4dd352709799a0061a80d97d562/lib/capybara/session.rb#L647
-  def accept_confirm(_text = nil, **_options)
+  def accept_confirm(_text = nil)
     yield if block_given?
 
     # The test can already be "within", so find the body using xpath
-    message = nil
     body = find(:xpath, "/html/body")
-    within(body.find(".confirm-reveal")) do
-      message = find(".confirm-modal-content").text
-      find("a.button[data-confirm-ok]").click
+    confirm_selector = "[data-confirm-modal-content]"
+    message = nil
+
+    within body do
+      message = find(confirm_selector).text
+      find("[data-confirm-ok]").click
     end
 
     message
@@ -26,15 +28,17 @@ module ConfirmationHelpers
   #
   # See:
   # https://github.com/teamcapybara/capybara/blob/44621209496fe4dd352709799a0061a80d97d562/lib/capybara/session.rb#L657
-  def dismiss_confirm(_text = nil, **_options)
+  def dismiss_confirm(_text = nil)
     yield if block_given?
 
     # The test can already be "within", so find the body using xpath
-    message = nil
     body = find(:xpath, "/html/body")
-    within(body.find(".confirm-reveal")) do
-      message = find(".confirm-modal-content").text
-      find("a.button[data-confirm-cancel]").click
+    confirm_selector = "[data-confirm-modal-content]"
+    message = nil
+
+    within body do
+      message = find(confirm_selector).text
+      find("[data-confirm-cancel]").click
     end
 
     message
@@ -43,15 +47,15 @@ module ConfirmationHelpers
   # Used to accept the "onbeforeunload" event's normal browser confirm modal
   # as this cannot be overridden. Original confirm dismiss implementation in
   # Capybara.
-  def accept_page_unload(text = nil, **options, &blk)
-    page.send(:accept_modal, :confirm, text, options, &blk)
+  def accept_page_unload(text = nil, **options, &)
+    page.send(:accept_modal, :confirm, text, options, &)
   end
 
   # Used to dismiss the "onbeforeunload" event's normal browser confirm modal
   # as this cannot be overridden. Original confirm dismiss implementation in
   # Capybara.
-  def dismiss_page_unload(text = nil, **options, &blk)
-    page.send(:dismiss_modal, :confirm, text, options, &blk)
+  def dismiss_page_unload(text = nil, **options, &)
+    page.send(:dismiss_modal, :confirm, text, options, &)
   end
 end
 

data/lib/decidim/dev/test/rspec_support/data_consent.rb

@@ -15,7 +15,7 @@ module Capybara
       if dialog_present
         click_button "Settings"
       else
-        within ".footer" do
+        within "footer" do
           click_link "Cookie settings"
         end
       end
@@ -25,7 +25,7 @@ module Capybara
       elsif categories.is_a?(Array)
         categories.each do |category|
           within "[data-id='#{category}']" do
-            find(".switch-paddle").click
+            find(".cookies__category-toggle").click
           end
         end
         click_button "Save settings"

data/lib/decidim/dev/test/rspec_support/dynamic_attach.rb

@@ -12,17 +12,32 @@ module Capybara
 
       yield if block_given?
 
+      front_interface = options.fetch(:front_interface, true)
+
       within ".upload-modal" do
-        find(".remove-upload-item").click if options[:remove_before]
+        click_remove(front_interface) if options[:remove_before]
         input_element = find("input[type='file']", visible: :all)
         input_element.attach_file(file_location)
         within "[data-filename='#{filename}']" do
-          expect(page).to have_css("div.progress-bar.filled", wait: 5)
+          expect(page).to have_css(filled_selector(front_interface), wait: 5)
+          expect(page).to have_content(filename.first(12)) if front_interface
         end
-        all("input.attachment-title").last.set(options[:title]) if options.has_key?(:title)
-        click_button "Save" unless options[:keep_modal_open]
+        all(title_input(front_interface)).last.set(options[:title]) if options.has_key?(:title)
+        click_button(front_interface ? "Next" : "Save") unless options[:keep_modal_open]
       end
     end
+
+    def filled_selector(front_interface)
+      front_interface ? "li progress[value='100']" : "div.progress-bar.filled"
+    end
+
+    def title_input(front_interface)
+      front_interface ? "input[type='text']" : "input.attachment-title"
+    end
+
+    def click_remove(front_interface)
+      front_interface ? click_button("Remove") : find(".remove-upload-item").click
+    end
   end
 end
 

data/lib/decidim/dev/test/rspec_support/editor_context.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+shared_context "with editor content containing hashtags and mentions" do
+  let(:hashtag) { create(:hashtag, organization:) }
+  let(:hashtag2) { create(:hashtag, organization:) }
+  let(:user) { create(:user, :confirmed, organization:) }
+  let(:user2) { create(:user, :confirmed, organization:) }
+  let(:user_group) { create(:user_group, :confirmed, organization:) }
+  let(:user_group2) { create(:user_group, :confirmed, organization:) }
+
+  let(:html) do
+    <<~HTML
+      <p>Paragraph with a hashtag #{hashtag.to_global_id} and another hashtag #{hashtag2.to_global_id}</p>
+      <p>Paragraph with a user mention #{user.to_global_id} and another user mention #{user2.to_global_id}</p>
+      <p>Paragraph with a user group mention #{user_group.to_global_id} and another user group mention #{user_group2.to_global_id}</p>
+    HTML
+  end
+  let(:editor_html) do
+    <<~HTML
+      <p>Paragraph with a hashtag #{html_hashtag(hashtag)} and another hashtag #{html_hashtag(hashtag2)}</p>
+      <p>Paragraph with a user mention #{html_mention(user)} and another user mention #{html_mention(user2)}</p>
+      <p>Paragraph with a user group mention #{html_mention(user_group)} and another user group mention #{html_mention(user_group2)}</p>
+    HTML
+  end
+
+  def html_hashtag(hashtag)
+    %(<span data-type="hashtag" data-label="##{hashtag.name}">##{hashtag.name}</span>)
+  end
+
+  def html_mention(mentionable)
+    mention = "@#{mentionable.nickname}"
+    label = "#{mention} (#{CGI.escapeHTML(mentionable.name)})"
+    %(<span data-type="mention" data-id="#{mention}" data-label="#{label}">#{label}</span>)
+  end
+end

data/lib/decidim/dev/test/rspec_support/engine_examples.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+shared_examples_for "clean engine" do
+  described_class.initializers.each do |initializer|
+    describe "'#{initializer.name}' initializer" do
+      let(:initializer_name_prefix) { described_class.to_s.sub(/::([A-Za-z]+)?Engine$/, "\\1").gsub("::", "").underscore }
+
+      it "is named correctly" do
+        expect(initializer.name).to start_with("#{initializer_name_prefix}.")
+        expect(initializer.name).to match(/^[a-z0-9_.]+$/)
+        expect(initializer.name).not_to start_with(".")
+      end
+    end
+  end
+end