shoulda-matchers 4.5.1 → 5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a62f760706ab97ba90edd181dbdf330ce6e8203c8ec3ec37a258022e202a53a6
-  data.tar.gz: 68f333b57646a8a437b73ff43f617efa9231674fb92f68de73365eb1408932f0
+  metadata.gz: b4bebbe2dbe599d4b1c19061803f12abb87578322e17a96a56d0442399ef72a9
+  data.tar.gz: 4742002f75d6cc61f6eb4419a4729632c000519ff1bd1e9c52754c251835294d
 SHA512:
-  metadata.gz: ea01851ee8521ff08ab6b1caea192c161e34286e5fd361cbceb6b84404813fa952acb73c70481c3140b2c5116ffce8bb386bf1feea70754f827a3918292b1bfb
-  data.tar.gz: 286ac5e78d534651889c5e3ed3843e1afa50d0fd77ed896c4ca3cf3622596cb7e1f47d2ae053e38100ce443dbfd80fbf1a8d099ecdfbbcf8d70912dbe3f42ad3
+  metadata.gz: 7b7c3f78337afc8da72887fa743956839d637e6eb277b0c6ba06a55837468b4ec598ae1bf534b58c9287b5b3e381e7ffe228a19b32a78c434f1048ffa6378441
+  data.tar.gz: 5944d64e1ab63143363ad0a2ee1f32fe761178664fe2e1bff38b71b324341719ec48619cc687d1b185dc1544e32badc65a21f16c694b33147db100fd93a33d2e

data/README.md

@@ -1,9 +1,9 @@
-# Shoulda Matchers [![Gem Version][version-badge]][rubygems] [![Build Status][travis-badge]][travis] [![Total Downloads][downloads-total]][rubygems] [![Downloads][downloads-badge]][rubygems]
+# Shoulda Matchers [![Gem Version][version-badge]][rubygems] [![Build Status][github-actions-badge]][github-actions] [![Total Downloads][downloads-total]][rubygems] [![Downloads][downloads-badge]][rubygems]
 
 [version-badge]: https://img.shields.io/gem/v/shoulda-matchers.svg
 [rubygems]: https://rubygems.org/gems/shoulda-matchers
-[travis-badge]: https://img.shields.io/travis/thoughtbot/shoulda-matchers/master.svg
-[travis]: https://travis-ci.org/thoughtbot/shoulda-matchers
+[github-actions-badge]: https://img.shields.io/github/workflow/status/thoughtbot/shoulda-matchers/Test
+[github-actions]: https://github.com/thoughtbot/shoulda-matchers/actions
 [downloads-total]: https://img.shields.io/gem/dt/shoulda-matchers.svg
 [downloads-badge]: https://img.shields.io/gem/dtv/shoulda-matchers.svg
 [downloads-badge]: https://img.shields.io/gem/dtv/shoulda-matchers.svg
@@ -430,11 +430,11 @@ about any of them, make sure to [consult the documentation][rubydocs]!
   makes assertions on the `session` hash.
 * **[set_flash](lib/shoulda/matchers/action_controller/set_flash_matcher.rb)**
   makes assertions on the `flash` hash.
-* **[use_after_action](lib/shoulda/matchers/action_controller/callback_matcher.rb#L79)**
+* **[use_after_action](lib/shoulda/matchers/action_controller/callback_matcher.rb#L29)**
   tests that an `after_action` callback is defined in your controller.
-* **[use_around_action](lib/shoulda/matchers/action_controller/callback_matcher.rb#L129)**
+* **[use_around_action](lib/shoulda/matchers/action_controller/callback_matcher.rb#L75)**
   tests that an `around_action` callback is defined in your controller.
-* **[use_before_action](lib/shoulda/matchers/action_controller/callback_matcher.rb#L54)**
+* **[use_before_action](lib/shoulda/matchers/action_controller/callback_matcher.rb#L4)**
   tests that a `before_action` callback is defined in your controller.
 
 ### Routing matchers
@@ -468,12 +468,14 @@ machine, understanding the codebase, and creating a good pull request.
 
 ## Compatibility
 
-Shoulda Matchers is [tested][travis] and supported against Ruby 2.4+, Rails
-4.2+, RSpec 3.x, and Minitest 5.x.
+Shoulda Matchers is tested and supported against Ruby 2.6+, Rails
+5.2+, RSpec 3.x, and Minitest 5.x.
 
-For Ruby < 2.4 and Rails < 4.1 compatibility, please use [v3.1.3][v3.1.3].
+- For Ruby < 2.4 and Rails < 4.1 compatibility, please use [v3.1.3][v3.1.3].
+- For Ruby < 3.0 and Rails < 6.1 compatibility, please use [v4.5.1][v4.5.1].
 
 [v3.1.3]: https://github.com/thoughtbot/shoulda-matchers/tree/v3.1.3
+[v4.5.1]: https://github.com/thoughtbot/shoulda-matchers/tree/v4.5.1
 
 ## Versioning
 

data/lib/shoulda/matchers/action_controller/callback_matcher.rb

@@ -1,64 +1,6 @@
 module Shoulda
   module Matchers
     module ActionController
-      # The `use_before_filter` matcher is used to test that a before_filter
-      # callback is defined within your controller.
-      #
-      #     class UsersController < ApplicationController
-      #       before_filter :authenticate_user!
-      #     end
-      #
-      #     # RSpec
-      #     RSpec.describe UsersController, type: :controller do
-      #       it { should use_before_filter(:authenticate_user!) }
-      #       it { should_not use_before_filter(:prevent_ssl) }
-      #     end
-      #
-      #     # Minitest (Shoulda)
-      #     class UsersControllerTest < ActionController::TestCase
-      #       should use_before_filter(:authenticate_user!)
-      #       should_not use_before_filter(:prevent_ssl)
-      #     end
-      #
-      # @note This method is only available when using shoulda-matchers under
-      # Rails 4.x.
-      # @return [CallbackMatcher]
-      #
-      if RailsShim.action_pack_lt_5?
-        def use_before_filter(callback)
-          CallbackMatcher.new(callback, :before, :filter)
-        end
-      end
-
-      # The `use_after_filter` matcher is used to test that an after_filter
-      # callback is defined within your controller.
-      #
-      #     class IssuesController < ApplicationController
-      #       after_filter :log_activity
-      #     end
-      #
-      #     # RSpec
-      #     RSpec.describe IssuesController, type: :controller do
-      #       it { should use_after_filter(:log_activity) }
-      #       it { should_not use_after_filter(:destroy_user) }
-      #     end
-      #
-      #     # Minitest (Shoulda)
-      #     class IssuesControllerTest < ActionController::TestCase
-      #       should use_after_filter(:log_activity)
-      #       should_not use_after_filter(:destroy_user)
-      #     end
-      #
-      # @note This method is only available when using shoulda-matchers under
-      # Rails 4.x.
-      # @return [CallbackMatcher]
-      #
-      if RailsShim.action_pack_lt_5?
-        def use_after_filter(callback)
-          CallbackMatcher.new(callback, :after, :filter)
-        end
-      end
-
       # The `use_before_action` matcher is used to test that a before_action
       # callback is defined within your controller.
       #
@@ -109,35 +51,6 @@ module Shoulda
         CallbackMatcher.new(callback, :after, :action)
       end
 
-      # The `use_around_filter` matcher is used to test that an around_filter
-      # callback is defined within your controller.
-      #
-      #     class ChangesController < ApplicationController
-      #       around_filter :wrap_in_transaction
-      #     end
-      #
-      #     # RSpec
-      #     RSpec.describe ChangesController, type: :controller do
-      #       it { should use_around_filter(:wrap_in_transaction) }
-      #       it { should_not use_around_filter(:save_view_context) }
-      #     end
-      #
-      #     # Minitest (Shoulda)
-      #     class ChangesControllerTest < ActionController::TestCase
-      #       should use_around_filter(:wrap_in_transaction)
-      #       should_not use_around_filter(:save_view_context)
-      #     end
-      #
-      # @note This method is only available when using shoulda-matchers under
-      # Rails 4.x.
-      # @return [CallbackMatcher]
-      #
-      if RailsShim.action_pack_lt_5?
-        def use_around_filter(callback)
-          CallbackMatcher.new(callback, :around, :filter)
-        end
-      end
-
       # The `use_around_action` matcher is used to test that an around_action
       # callback is defined within your controller.
       #

data/lib/shoulda/matchers/action_controller/flash_store.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/module/delegation'
 module Shoulda
   module Matchers
     module ActionController
@@ -34,10 +35,7 @@ module Shoulda
             expected_value === actual_value
           end
         end
-
-        def empty?
-          flash.empty?
-        end
+        delegate :empty?, to: :flash
 
         def use_now!
           @use_now = true

data/lib/shoulda/matchers/action_controller/permit_matcher.rb

@@ -251,12 +251,9 @@ module Shoulda
           parameters_double_registry.register
 
           Doublespeak.with_doubles_activated do
-            Shoulda::Matchers::RailsShim.make_controller_request(
-              context,
-              verb,
-              action,
-              request_params,
-            )
+            params = { params: request_params }
+
+            context.__send__(verb, action, **params)
           end
 
           unpermitted_parameter_names.empty?

data/lib/shoulda/matchers/active_model.rb

@@ -26,7 +26,6 @@ require 'shoulda/matchers/active_model/numericality_matchers/comparison_matcher'
 require 'shoulda/matchers/active_model/numericality_matchers/odd_number_matcher'
 require 'shoulda/matchers/active_model/numericality_matchers/even_number_matcher'
 require 'shoulda/matchers/active_model/numericality_matchers/only_integer_matcher'
-require 'shoulda/matchers/active_model/allow_mass_assignment_of_matcher'
 require 'shoulda/matchers/active_model/errors'
 require 'shoulda/matchers/active_model/have_secure_password_matcher'
 

data/lib/shoulda/matchers/active_model/validate_absence_of_matcher.rb

@@ -113,7 +113,7 @@ module Shoulda
             case column_type
             when :integer, :float then 1
             when :decimal then BigDecimal(1, 0)
-            when :datetime, :time, :timestamp then Time.now
+            when :datetime, :time, :timestamp then Time.current
             when :date then Date.new
             when :binary then '0'
             else 'an arbitrary value'

data/lib/shoulda/matchers/active_model/validate_numericality_of_matcher.rb

@@ -643,7 +643,7 @@ module Shoulda
             if number_of_submatchers_for_failure_message > 1
               "In checking that #{model.name} #{submatcher_description}, " +
                 failure_message[0].downcase +
-                failure_message[1..-1]
+                failure_message[1..]
             else
               failure_message
             end

data/lib/shoulda/matchers/active_model/validate_presence_of_matcher.rb

@@ -327,8 +327,8 @@ validation for you? Instead of using `validate_presence_of`, try
         end
 
         def collection_association?
-          association? && association_reflection.macro.in?(
-            [:has_many, :has_and_belongs_to_many],
+          association? && [:has_many, :has_and_belongs_to_many].include?(
+            association_reflection.macro,
           )
         end
 

data/lib/shoulda/matchers/active_model/validator.rb

@@ -98,12 +98,7 @@ module Shoulda
 
           all_validation_errors = record.errors.dup
 
-          validation_error_messages =
-            if record.errors.respond_to?(:[])
-              record.errors[attribute]
-            else
-              record.errors.on(attribute)
-            end
+          validation_error_messages = record.errors[attribute]
 
           {
             all_validation_errors: all_validation_errors,

data/lib/shoulda/matchers/active_record/association_matcher.rb

@@ -1004,7 +1004,7 @@ module Shoulda
           @submatchers = []
           @missing = ''
 
-          if macro == :belongs_to && RailsShim.active_record_gte_5?
+          if macro == :belongs_to
             required(belongs_to_required_by_default?)
           end
         end
@@ -1394,23 +1394,25 @@ module Shoulda
         end
 
         def class_has_foreign_key?(klass)
+          @missing = validate_foreign_key(klass)
+
+          @missing.nil?
+        end
+
+        def validate_foreign_key(klass)
           if options.key?(:foreign_key) && !foreign_key_correct?
-            @missing = foreign_key_failure_message(klass, options[:foreign_key])
-            false
-          elsif !has_column?(klass, foreign_key)
-            @missing = foreign_key_failure_message(klass, foreign_key)
-            false
-          else
-            true
+            foreign_key_failure_message(klass, options[:foreign_key])
+          elsif !has_column?(klass, actual_foreign_key)
+            foreign_key_failure_message(klass, actual_foreign_key)
           end
         end
 
         def has_column?(klass, column)
           case column
           when Array
-            column.all? { |c| has_column?(klass, c) }
+            column.all? { |c| has_column?(klass, c.to_s) }
           else
-            column_names_for(klass).include?(column)
+            column_names_for(klass).include?(column.to_s)
           end
         end
 
@@ -1442,19 +1444,15 @@ module Shoulda
           end
         end
 
-        def foreign_key
-          key = if foreign_key_reflection
-                  if foreign_key_reflection.respond_to?(:foreign_key)
-                    foreign_key_reflection.foreign_key
-                  else
-                    foreign_key_reflection.primary_key_name
-                  end
-                end
-
-          if key.is_a?(Array)
-            key.map(&:to_s)
+        def actual_foreign_key
+          return unless foreign_key_reflection
+
+          if foreign_key_reflection.options[:foreign_key]
+            foreign_key_reflection.options[:foreign_key]
+          elsif foreign_key_reflection.respond_to?(:foreign_key)
+            foreign_key_reflection.foreign_key
           else
-            key.to_s
+            foreign_key_reflection.primary_key_name
           end
         end
 

data/lib/shoulda/matchers/active_record/association_matchers/join_table_matcher.rb

@@ -42,7 +42,7 @@ module Shoulda
           end
 
           def join_table_exists?
-            if RailsShim.tables_and_views(connection).
+            if connection.data_sources.
                 include?(join_table_name.to_s)
               true
             else

data/lib/shoulda/matchers/active_record/association_matchers/required_matcher.rb

@@ -65,7 +65,7 @@ module Shoulda
           end
 
           def validation_message_key
-            RailsShim.validation_message_key_for_association_required_option
+            :required
           end
         end
       end

data/lib/shoulda/matchers/active_record/define_enum_for_matcher.rb

@@ -6,16 +6,22 @@ module Shoulda
       #
       #     class Process < ActiveRecord::Base
       #       enum status: [:running, :stopped, :suspended]
+      #
+      #       alias_attribute :kind, :SomeLegacyField
+      #
+      #       enum kind: [:foo, :bar]
       #     end
       #
       #     # RSpec
       #     RSpec.describe Process, type: :model do
       #       it { should define_enum_for(:status) }
+      #       it { should define_enum_for(:kind) }
       #     end
       #
       #     # Minitest (Shoulda)
       #     class ProcessTest < ActiveSupport::TestCase
       #       should define_enum_for(:status)
+      #       should define_enum_for(:kind)
       #     end
       #
       # #### Qualifiers
@@ -370,7 +376,10 @@ module Shoulda
         end
 
         def column
-          model.columns_hash[attribute_name.to_s]
+          key = attribute_name.to_s
+          column_name = model.attribute_alias(key) || key
+
+          model.columns_hash[column_name]
         end
 
         def model

data/lib/shoulda/matchers/rails_shim.rb

@@ -3,24 +3,12 @@ module Shoulda
     # @private
     module RailsShim # rubocop:disable Metrics/ModuleLength
       class << self
-        def action_pack_gte_5?
-          Gem::Requirement.new('>= 5').satisfied_by?(action_pack_version)
-        end
-
-        def action_pack_lt_5?
-          Gem::Requirement.new('< 5').satisfied_by?(action_pack_version)
-        end
-
         def action_pack_version
           Gem::Version.new(::ActionPack::VERSION::STRING)
         rescue NameError
           Gem::Version.new('0')
         end
 
-        def active_record_gte_5?
-          Gem::Requirement.new('>= 5').satisfied_by?(active_record_version)
-        end
-
         def active_record_gte_6?
           Gem::Requirement.new('>= 6').satisfied_by?(active_record_version)
         end
@@ -57,17 +45,6 @@ module Shoulda
           )
         end
 
-        def make_controller_request(context, verb, action, request_params)
-          params =
-            if action_pack_gte_5?
-              { params: request_params }
-            else
-              request_params
-            end
-
-          context.__send__(verb, action, params)
-        end
-
         def serialized_attributes_for(model)
           attribute_types_for(model).
             inject({}) do |hash, (attribute_name, attribute_type)|
@@ -85,26 +62,10 @@ module Shoulda
           serialized_attributes_for(model)[attribute_name.to_s]
         end
 
-        def tables_and_views(connection)
-          if active_record_gte_5?
-            connection.data_sources
-          else
-            connection.tables
-          end
-        end
-
         def verb_for_update
           :patch
         end
 
-        def validation_message_key_for_association_required_option
-          if active_record_gte_5?
-            :required
-          else
-            :blank
-          end
-        end
-
         def parent_of(mod)
           if mod.respond_to?(:module_parent)
             mod.module_parent

data/lib/shoulda/matchers/util/word_wrap.rb

@@ -185,7 +185,7 @@ module Shoulda
           leftover = ''
         else
           fitted_line = line[0..index].rstrip
-          leftover = line[index + 1..-1]
+          leftover = line[index + 1..]
         end
 
         { fitted_line: fitted_line, leftover: leftover }

data/lib/shoulda/matchers/version.rb

@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
     # @private
-    VERSION = '4.5.1'.freeze
+    VERSION = '5.0.0.rc1'.freeze
   end
 end

data/shoulda-matchers.gemspec

@@ -36,6 +36,6 @@ Gem::Specification.new do |s|
     'shoulda-matchers.gemspec']
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.4.0'
-  s.add_dependency('activesupport', '>= 4.2.0')
+  s.required_ruby_version = '>= 2.6.0'
+  s.add_dependency('activesupport', '>= 5.2.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 5.0.0.rc1
 platform: ruby
 authors:
 - Tammer Saleh
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -22,14 +22,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
 description: 'Shoulda Matchers provides RSpec- and Minitest-compatible one-liners
   to test common Rails functionality that, if written by hand, would be much longer,
   more complex, and error-prone. '
@@ -60,7 +60,6 @@ files:
 - lib/shoulda/matchers/action_controller/set_session_matcher.rb
 - lib/shoulda/matchers/action_controller/set_session_or_flash_matcher.rb
 - lib/shoulda/matchers/active_model.rb
-- lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher/attribute_changed_value_error.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher/attribute_does_not_exist_error.rb
@@ -186,14 +185,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Simple one-liner tests for common Rails functionality

data/lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb

@@ -1,161 +0,0 @@
-module Shoulda
-  module Matchers
-    module ActiveModel
-      # The `allow_mass_assignment_of` matcher tests usage of Rails 3's
-      # `attr_accessible` and `attr_protected` macros, asserting that an
-      # attribute in your model is contained in either the whitelist or
-      # blacklist and thus can or cannot be set via mass assignment.
-      #
-      #     class Post
-      #       include ActiveModel::Model
-      #       include ActiveModel::MassAssignmentSecurity
-      #       attr_accessor :title
-      #
-      #       attr_accessible :title
-      #     end
-      #
-      #     class User
-      #       include ActiveModel::Model
-      #       include ActiveModel::MassAssignmentSecurity
-      #       attr_accessor :encrypted_password
-      #
-      #       attr_protected :encrypted_password
-      #     end
-      #
-      #     # RSpec
-      #     RSpec.describe Post, type: :model do
-      #       it { should allow_mass_assignment_of(:title) }
-      #     end
-      #
-      #     RSpec.describe User, type: :model do
-      #       it { should_not allow_mass_assignment_of(:encrypted_password) }
-      #     end
-      #
-      #     # Minitest (Shoulda)
-      #     class PostTest < ActiveSupport::TestCase
-      #       should allow_mass_assignment_of(:title)
-      #     end
-      #
-      #     class UserTest < ActiveSupport::TestCase
-      #       should_not allow_mass_assignment_of(:encrypted_password)
-      #     end
-      #
-      # #### Optional qualifiers
-      #
-      # ##### as
-      #
-      # Use `as` if your mass-assignment rules apply only under a certain role
-      # *(Rails >= 3.1 only)*.
-      #
-      #     class Post
-      #       include ActiveModel::Model
-      #       include ActiveModel::MassAssignmentSecurity
-      #       attr_accessor :title
-      #
-      #       attr_accessible :title, as: :admin
-      #     end
-      #
-      #     # RSpec
-      #     RSpec.describe Post, type: :model do
-      #       it { should allow_mass_assignment_of(:title).as(:admin) }
-      #     end
-      #
-      #     # Minitest (Shoulda)
-      #     class PostTest < ActiveSupport::TestCase
-      #       should allow_mass_assignment_of(:title).as(:admin)
-      #     end
-      #
-      # @return [AllowMassAssignmentOfMatcher]
-      #
-      def allow_mass_assignment_of(value)
-        AllowMassAssignmentOfMatcher.new(value)
-      end
-
-      # @private
-      class AllowMassAssignmentOfMatcher
-        attr_reader :failure_message, :failure_message_when_negated
-
-        def initialize(attribute)
-          @attribute = attribute.to_s
-          @options = {}
-        end
-
-        def as(role)
-          @options[:role] = role
-          self
-        end
-
-        def matches?(subject)
-          @subject = subject
-          if attr_mass_assignable?
-            if whitelisting?
-              @failure_message_when_negated = "#{@attribute} was made "\
-                'accessible'
-            elsif protected_attributes.empty?
-              @failure_message_when_negated = 'no attributes were protected'
-            else
-              @failure_message_when_negated =
-                "#{class_name} is protecting " <<
-                "#{protected_attributes.to_a.to_sentence}, " <<
-                "but not #{@attribute}."
-            end
-            true
-          else
-            @failure_message =
-              if whitelisting?
-                "Expected #{@attribute} to be accessible"
-              else
-                "Did not expect #{@attribute} to be protected"
-              end
-            false
-          end
-        end
-
-        def description
-          [base_description, role_description].compact.join(' ')
-        end
-
-        private
-
-        def base_description
-          "allow mass assignment of #{@attribute}"
-        end
-
-        def role_description
-          if role != :default
-            "as #{role}"
-          end
-        end
-
-        def role
-          @options[:role] || :default
-        end
-
-        def protected_attributes
-          @_protected_attributes ||= (@subject.class.protected_attributes || [])
-        end
-
-        def accessible_attributes
-          @_accessible_attributes ||=
-            (@subject.class.accessible_attributes || [])
-        end
-
-        def whitelisting?
-          authorizer.is_a?(::ActiveModel::MassAssignmentSecurity::WhiteList)
-        end
-
-        def attr_mass_assignable?
-          !authorizer.deny?(@attribute)
-        end
-
-        def authorizer
-          @subject.class.active_authorizer[role]
-        end
-
-        def class_name
-          @subject.class.name
-        end
-      end
-    end
-  end
-end