rails_edge_test 1.2.3 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +28 -0
- data/.gitignore +2 -0
- data/CHANGELOG.md +9 -1
- data/lib/rails_edge_test/dsl/edge.rb +23 -1
- data/lib/rails_edge_test/version.rb +1 -1
- data/nix/Gemfile +4 -4
- data/nix/Gemfile.lock +136 -102
- data/nix/gemset.nix +182 -128
- data/nix/sources.json +5 -17
- data/nix/sources.nix +106 -46
- data/nix/update-gemset.sh +1 -1
- data/rails_edge_test.gemspec +2 -2
- data/shell.nix +10 -3
- metadata +8 -13
- data/.travis.yml +0 -11
- data/gemfiles/rails_5.2.gemfile +0 -7
- data/gemfiles/rails_5.2.gemfile.lock +0 -149
- data/gemfiles/rails_6.0.gemfile +0 -7
- data/gemfiles/rails_6.0.gemfile.lock +0 -165
- data/gemfiles/rspec_6.0.gemfile.lock +0 -165
    
        checksums.yaml
    CHANGED
    
    | @@ -1,7 +1,7 @@ | |
| 1 1 | 
             
            ---
         | 
| 2 2 | 
             
            SHA256:
         | 
| 3 | 
            -
              metadata.gz:  | 
| 4 | 
            -
              data.tar.gz:  | 
| 3 | 
            +
              metadata.gz: d665e5c9391002853173b89eb3507f3064672001bb38442910a6707fc0eedea4
         | 
| 4 | 
            +
              data.tar.gz: d67210bd8d38c8ac38cfef7d8215b1a1555dbbc75648c5cce7132f0ae874e630
         | 
| 5 5 | 
             
            SHA512:
         | 
| 6 | 
            -
              metadata.gz:  | 
| 7 | 
            -
              data.tar.gz:  | 
| 6 | 
            +
              metadata.gz: 288e099487db1c0c2c8f89d0fc101af3121cceb47c0ba3febf52ba1df2dc7b51cfa6ebc1561e9d73d8f21292889e50ca7b95332479bf1f77cff4b4987854bd80
         | 
| 7 | 
            +
              data.tar.gz: f79b3172693176158bd7aa2cc01e00424575985503070627f6bf2bc93f7028e4b59de44a79c4d6d1d6226f2b6bfa3062954d52ff44d6a08bfbf4e2e316ec6ad1
         | 
| @@ -0,0 +1,28 @@ | |
| 1 | 
            +
            name: Run tests
         | 
| 2 | 
            +
            on:
         | 
| 3 | 
            +
              pull_request:
         | 
| 4 | 
            +
                branches:
         | 
| 5 | 
            +
                  - "master"
         | 
| 6 | 
            +
              push:
         | 
| 7 | 
            +
                branches:
         | 
| 8 | 
            +
                  - "master"
         | 
| 9 | 
            +
             | 
| 10 | 
            +
              # We also provide a way to run this manually, if needed.
         | 
| 11 | 
            +
              workflow_dispatch:
         | 
| 12 | 
            +
             | 
| 13 | 
            +
            jobs:
         | 
| 14 | 
            +
              ci:
         | 
| 15 | 
            +
                runs-on: ubuntu-22.04
         | 
| 16 | 
            +
                steps:
         | 
| 17 | 
            +
                  - name: Install Nix
         | 
| 18 | 
            +
                    uses: cachix/install-nix-action@v26
         | 
| 19 | 
            +
                    with:
         | 
| 20 | 
            +
                      nix_path: nixpkgs=channel:nixos-24.05
         | 
| 21 | 
            +
             | 
| 22 | 
            +
                  - name: Check out repository code
         | 
| 23 | 
            +
                    uses: actions/checkout@v3
         | 
| 24 | 
            +
                    with:
         | 
| 25 | 
            +
                      fetch-depth: 0
         | 
| 26 | 
            +
             | 
| 27 | 
            +
                  - name: Run tests
         | 
| 28 | 
            +
                    run: nix-shell --run rspec
         | 
    
        data/.gitignore
    CHANGED
    
    
    
        data/CHANGELOG.md
    CHANGED
    
    | @@ -1,6 +1,14 @@ | |
| 1 1 | 
             
            # The Changelog
         | 
| 2 2 |  | 
| 3 | 
            -
            ## Version 1. | 
| 3 | 
            +
            ## Version 2.1.0: August 13, 2024
         | 
| 4 | 
            +
            - adds `delete` method for simulating delete requests
         | 
| 5 | 
            +
            - adds `set_authenticity_token` method for setting the authenticity token in the header & session
         | 
| 6 | 
            +
             | 
| 7 | 
            +
            ## Version 2.0.0: August 13, 2024
         | 
| 8 | 
            +
            - drops support for Ruby 2.*
         | 
| 9 | 
            +
            - adds `post` method for simulating post requests
         | 
| 10 | 
            +
             | 
| 11 | 
            +
            ## Version 1.2.3: December 8, 2020
         | 
| 4 12 | 
             
            - Add rails 6 support (#39)
         | 
| 5 13 |  | 
| 6 14 | 
             
            ## Version 1.2.2: April 20, 2020
         | 
| @@ -28,7 +28,29 @@ module RailsEdgeTest::Dsl | |
| 28 28 | 
             
                  @response
         | 
| 29 29 | 
             
                end
         | 
| 30 30 |  | 
| 31 | 
            -
                def perform_get(parameters | 
| 31 | 
            +
                def perform_get(parameters={})
         | 
| 32 | 
            +
                  process(parameters)
         | 
| 33 | 
            +
                end
         | 
| 34 | 
            +
             | 
| 35 | 
            +
                def perform_post(parameters={})
         | 
| 36 | 
            +
                  request.instance_variable_set(:@method, "POST")
         | 
| 37 | 
            +
                  request.env['REQUEST_METHOD'] = "POST"
         | 
| 38 | 
            +
                  process(parameters)
         | 
| 39 | 
            +
                end
         | 
| 40 | 
            +
             | 
| 41 | 
            +
                def perform_delete(parameters={})
         | 
| 42 | 
            +
                  request.instance_variable_set(:@method, "DELETE")
         | 
| 43 | 
            +
                  request.env['REQUEST_METHOD'] = "DELETE"
         | 
| 44 | 
            +
                  process(parameters)
         | 
| 45 | 
            +
                end
         | 
| 46 | 
            +
             | 
| 47 | 
            +
                def set_authenticity_token
         | 
| 48 | 
            +
                  r = request
         | 
| 49 | 
            +
                  controller.instance_eval { @_request = r }
         | 
| 50 | 
            +
                  request.headers['X-CSRF-Token'] = controller.send :form_authenticity_token
         | 
| 51 | 
            +
                end
         | 
| 52 | 
            +
             | 
| 53 | 
            +
                def process(parameters={})
         | 
| 32 54 | 
             
                  request.assign_parameters(
         | 
| 33 55 | 
             
                    ::Rails.application.routes,
         | 
| 34 56 | 
             
                    controller_class.controller_path,
         | 
    
        data/nix/Gemfile
    CHANGED
    
    | @@ -2,11 +2,11 @@ | |
| 2 2 | 
             
            # since bundix doesn't support reading the gemspec itself.
         | 
| 3 3 | 
             
            source 'https://rubygems.org'
         | 
| 4 4 |  | 
| 5 | 
            -
            gem 'actionpack', '~>  | 
| 5 | 
            +
            gem 'actionpack', '~> 7.0'
         | 
| 6 6 |  | 
| 7 7 | 
             
            group :development do
         | 
| 8 | 
            -
              gem 'rails', '~>  | 
| 9 | 
            -
              gem 'sqlite3', '~> 1. | 
| 8 | 
            +
              gem 'rails', '~> 7.0'
         | 
| 9 | 
            +
              gem 'sqlite3', '~> 1.6.3'
         | 
| 10 10 | 
             
              gem 'rake', '~> 13.0'
         | 
| 11 | 
            -
              gem 'rspec', '~> 3. | 
| 11 | 
            +
              gem 'rspec', '~> 3.12'
         | 
| 12 12 | 
             
            end
         | 
    
        data/nix/Gemfile.lock
    CHANGED
    
    | @@ -1,138 +1,172 @@ | |
| 1 1 | 
             
            GEM
         | 
| 2 2 | 
             
              remote: https://rubygems.org/
         | 
| 3 3 | 
             
              specs:
         | 
| 4 | 
            -
                actioncable ( | 
| 5 | 
            -
                  actionpack (=  | 
| 4 | 
            +
                actioncable (7.0.5)
         | 
| 5 | 
            +
                  actionpack (= 7.0.5)
         | 
| 6 | 
            +
                  activesupport (= 7.0.5)
         | 
| 6 7 | 
             
                  nio4r (~> 2.0)
         | 
| 7 8 | 
             
                  websocket-driver (>= 0.6.1)
         | 
| 8 | 
            -
                 | 
| 9 | 
            -
                  actionpack (=  | 
| 10 | 
            -
                   | 
| 11 | 
            -
                   | 
| 9 | 
            +
                actionmailbox (7.0.5)
         | 
| 10 | 
            +
                  actionpack (= 7.0.5)
         | 
| 11 | 
            +
                  activejob (= 7.0.5)
         | 
| 12 | 
            +
                  activerecord (= 7.0.5)
         | 
| 13 | 
            +
                  activestorage (= 7.0.5)
         | 
| 14 | 
            +
                  activesupport (= 7.0.5)
         | 
| 15 | 
            +
                  mail (>= 2.7.1)
         | 
| 16 | 
            +
                  net-imap
         | 
| 17 | 
            +
                  net-pop
         | 
| 18 | 
            +
                  net-smtp
         | 
| 19 | 
            +
                actionmailer (7.0.5)
         | 
| 20 | 
            +
                  actionpack (= 7.0.5)
         | 
| 21 | 
            +
                  actionview (= 7.0.5)
         | 
| 22 | 
            +
                  activejob (= 7.0.5)
         | 
| 23 | 
            +
                  activesupport (= 7.0.5)
         | 
| 12 24 | 
             
                  mail (~> 2.5, >= 2.5.4)
         | 
| 25 | 
            +
                  net-imap
         | 
| 26 | 
            +
                  net-pop
         | 
| 27 | 
            +
                  net-smtp
         | 
| 13 28 | 
             
                  rails-dom-testing (~> 2.0)
         | 
| 14 | 
            -
                actionpack ( | 
| 15 | 
            -
                  actionview (=  | 
| 16 | 
            -
                  activesupport (=  | 
| 17 | 
            -
                  rack (~> 2.0, >= 2. | 
| 29 | 
            +
                actionpack (7.0.5)
         | 
| 30 | 
            +
                  actionview (= 7.0.5)
         | 
| 31 | 
            +
                  activesupport (= 7.0.5)
         | 
| 32 | 
            +
                  rack (~> 2.0, >= 2.2.4)
         | 
| 18 33 | 
             
                  rack-test (>= 0.6.3)
         | 
| 19 34 | 
             
                  rails-dom-testing (~> 2.0)
         | 
| 20 | 
            -
                  rails-html-sanitizer (~> 1.0, >= 1.0 | 
| 21 | 
            -
                 | 
| 22 | 
            -
                   | 
| 35 | 
            +
                  rails-html-sanitizer (~> 1.0, >= 1.2.0)
         | 
| 36 | 
            +
                actiontext (7.0.5)
         | 
| 37 | 
            +
                  actionpack (= 7.0.5)
         | 
| 38 | 
            +
                  activerecord (= 7.0.5)
         | 
| 39 | 
            +
                  activestorage (= 7.0.5)
         | 
| 40 | 
            +
                  activesupport (= 7.0.5)
         | 
| 41 | 
            +
                  globalid (>= 0.6.0)
         | 
| 42 | 
            +
                  nokogiri (>= 1.8.5)
         | 
| 43 | 
            +
                actionview (7.0.5)
         | 
| 44 | 
            +
                  activesupport (= 7.0.5)
         | 
| 23 45 | 
             
                  builder (~> 3.1)
         | 
| 24 46 | 
             
                  erubi (~> 1.4)
         | 
| 25 47 | 
             
                  rails-dom-testing (~> 2.0)
         | 
| 26 | 
            -
                  rails-html-sanitizer (~> 1. | 
| 27 | 
            -
                activejob ( | 
| 28 | 
            -
                  activesupport (=  | 
| 48 | 
            +
                  rails-html-sanitizer (~> 1.1, >= 1.2.0)
         | 
| 49 | 
            +
                activejob (7.0.5)
         | 
| 50 | 
            +
                  activesupport (= 7.0.5)
         | 
| 29 51 | 
             
                  globalid (>= 0.3.6)
         | 
| 30 | 
            -
                activemodel ( | 
| 31 | 
            -
                  activesupport (=  | 
| 32 | 
            -
                activerecord ( | 
| 33 | 
            -
                  activemodel (=  | 
| 34 | 
            -
                  activesupport (=  | 
| 35 | 
            -
             | 
| 36 | 
            -
             | 
| 37 | 
            -
                   | 
| 38 | 
            -
                  activerecord (=  | 
| 39 | 
            -
                   | 
| 40 | 
            -
             | 
| 52 | 
            +
                activemodel (7.0.5)
         | 
| 53 | 
            +
                  activesupport (= 7.0.5)
         | 
| 54 | 
            +
                activerecord (7.0.5)
         | 
| 55 | 
            +
                  activemodel (= 7.0.5)
         | 
| 56 | 
            +
                  activesupport (= 7.0.5)
         | 
| 57 | 
            +
                activestorage (7.0.5)
         | 
| 58 | 
            +
                  actionpack (= 7.0.5)
         | 
| 59 | 
            +
                  activejob (= 7.0.5)
         | 
| 60 | 
            +
                  activerecord (= 7.0.5)
         | 
| 61 | 
            +
                  activesupport (= 7.0.5)
         | 
| 62 | 
            +
                  marcel (~> 1.0)
         | 
| 63 | 
            +
                  mini_mime (>= 1.1.0)
         | 
| 64 | 
            +
                activesupport (7.0.5)
         | 
| 41 65 | 
             
                  concurrent-ruby (~> 1.0, >= 1.0.2)
         | 
| 42 | 
            -
                  i18n (>=  | 
| 43 | 
            -
                  minitest ( | 
| 44 | 
            -
                  tzinfo (~>  | 
| 45 | 
            -
                arel (9.0.0)
         | 
| 66 | 
            +
                  i18n (>= 1.6, < 2)
         | 
| 67 | 
            +
                  minitest (>= 5.1)
         | 
| 68 | 
            +
                  tzinfo (~> 2.0)
         | 
| 46 69 | 
             
                builder (3.2.4)
         | 
| 47 | 
            -
                concurrent-ruby (1. | 
| 70 | 
            +
                concurrent-ruby (1.2.2)
         | 
| 48 71 | 
             
                crass (1.0.6)
         | 
| 49 | 
            -
                 | 
| 50 | 
            -
                 | 
| 51 | 
            -
                 | 
| 52 | 
            -
             | 
| 53 | 
            -
             | 
| 72 | 
            +
                date (3.3.3)
         | 
| 73 | 
            +
                diff-lcs (1.5.0)
         | 
| 74 | 
            +
                erubi (1.12.0)
         | 
| 75 | 
            +
                globalid (1.1.0)
         | 
| 76 | 
            +
                  activesupport (>= 5.0)
         | 
| 77 | 
            +
                i18n (1.13.0)
         | 
| 54 78 | 
             
                  concurrent-ruby (~> 1.0)
         | 
| 55 | 
            -
                loofah (2. | 
| 79 | 
            +
                loofah (2.21.3)
         | 
| 56 80 | 
             
                  crass (~> 1.0.2)
         | 
| 57 | 
            -
                  nokogiri (>= 1. | 
| 58 | 
            -
                mail (2. | 
| 81 | 
            +
                  nokogiri (>= 1.12.0)
         | 
| 82 | 
            +
                mail (2.8.1)
         | 
| 59 83 | 
             
                  mini_mime (>= 0.1.1)
         | 
| 60 | 
            -
             | 
| 61 | 
            -
                   | 
| 84 | 
            +
                  net-imap
         | 
| 85 | 
            +
                  net-pop
         | 
| 86 | 
            +
                  net-smtp
         | 
| 87 | 
            +
                marcel (1.0.2)
         | 
| 62 88 | 
             
                method_source (1.0.0)
         | 
| 63 | 
            -
                 | 
| 64 | 
            -
                 | 
| 65 | 
            -
                 | 
| 66 | 
            -
                 | 
| 67 | 
            -
             | 
| 68 | 
            -
             | 
| 69 | 
            -
             | 
| 70 | 
            -
             | 
| 71 | 
            -
                 | 
| 72 | 
            -
                   | 
| 73 | 
            -
                 | 
| 74 | 
            -
                   | 
| 75 | 
            -
             | 
| 76 | 
            -
             | 
| 77 | 
            -
                   | 
| 78 | 
            -
                   | 
| 79 | 
            -
             | 
| 80 | 
            -
             | 
| 81 | 
            -
             | 
| 82 | 
            -
                   | 
| 83 | 
            -
             | 
| 84 | 
            -
                   | 
| 85 | 
            -
                   | 
| 89 | 
            +
                mini_mime (1.1.2)
         | 
| 90 | 
            +
                mini_portile2 (2.8.2)
         | 
| 91 | 
            +
                minitest (5.18.0)
         | 
| 92 | 
            +
                net-imap (0.3.4)
         | 
| 93 | 
            +
                  date
         | 
| 94 | 
            +
                  net-protocol
         | 
| 95 | 
            +
                net-pop (0.1.2)
         | 
| 96 | 
            +
                  net-protocol
         | 
| 97 | 
            +
                net-protocol (0.2.1)
         | 
| 98 | 
            +
                  timeout
         | 
| 99 | 
            +
                net-smtp (0.3.3)
         | 
| 100 | 
            +
                  net-protocol
         | 
| 101 | 
            +
                nio4r (2.5.9)
         | 
| 102 | 
            +
                nokogiri (1.15.2)
         | 
| 103 | 
            +
                  mini_portile2 (~> 2.8.2)
         | 
| 104 | 
            +
                  racc (~> 1.4)
         | 
| 105 | 
            +
                racc (1.6.2)
         | 
| 106 | 
            +
                rack (2.2.7)
         | 
| 107 | 
            +
                rack-test (2.1.0)
         | 
| 108 | 
            +
                  rack (>= 1.3)
         | 
| 109 | 
            +
                rails (7.0.5)
         | 
| 110 | 
            +
                  actioncable (= 7.0.5)
         | 
| 111 | 
            +
                  actionmailbox (= 7.0.5)
         | 
| 112 | 
            +
                  actionmailer (= 7.0.5)
         | 
| 113 | 
            +
                  actionpack (= 7.0.5)
         | 
| 114 | 
            +
                  actiontext (= 7.0.5)
         | 
| 115 | 
            +
                  actionview (= 7.0.5)
         | 
| 116 | 
            +
                  activejob (= 7.0.5)
         | 
| 117 | 
            +
                  activemodel (= 7.0.5)
         | 
| 118 | 
            +
                  activerecord (= 7.0.5)
         | 
| 119 | 
            +
                  activestorage (= 7.0.5)
         | 
| 120 | 
            +
                  activesupport (= 7.0.5)
         | 
| 121 | 
            +
                  bundler (>= 1.15.0)
         | 
| 122 | 
            +
                  railties (= 7.0.5)
         | 
| 86 123 | 
             
                rails-dom-testing (2.0.3)
         | 
| 87 124 | 
             
                  activesupport (>= 4.2.0)
         | 
| 88 125 | 
             
                  nokogiri (>= 1.6)
         | 
| 89 | 
            -
                rails-html-sanitizer (1. | 
| 90 | 
            -
                  loofah (~> 2. | 
| 91 | 
            -
             | 
| 92 | 
            -
             | 
| 93 | 
            -
                   | 
| 126 | 
            +
                rails-html-sanitizer (1.6.0)
         | 
| 127 | 
            +
                  loofah (~> 2.21)
         | 
| 128 | 
            +
                  nokogiri (~> 1.14)
         | 
| 129 | 
            +
                railties (7.0.5)
         | 
| 130 | 
            +
                  actionpack (= 7.0.5)
         | 
| 131 | 
            +
                  activesupport (= 7.0.5)
         | 
| 94 132 | 
             
                  method_source
         | 
| 95 | 
            -
                  rake (>=  | 
| 96 | 
            -
                  thor ( | 
| 97 | 
            -
             | 
| 98 | 
            -
                 | 
| 99 | 
            -
             | 
| 100 | 
            -
                  rspec- | 
| 101 | 
            -
                  rspec- | 
| 102 | 
            -
             | 
| 103 | 
            -
             | 
| 104 | 
            -
             | 
| 133 | 
            +
                  rake (>= 12.2)
         | 
| 134 | 
            +
                  thor (~> 1.0)
         | 
| 135 | 
            +
                  zeitwerk (~> 2.5)
         | 
| 136 | 
            +
                rake (13.0.6)
         | 
| 137 | 
            +
                rspec (3.12.0)
         | 
| 138 | 
            +
                  rspec-core (~> 3.12.0)
         | 
| 139 | 
            +
                  rspec-expectations (~> 3.12.0)
         | 
| 140 | 
            +
                  rspec-mocks (~> 3.12.0)
         | 
| 141 | 
            +
                rspec-core (3.12.2)
         | 
| 142 | 
            +
                  rspec-support (~> 3.12.0)
         | 
| 143 | 
            +
                rspec-expectations (3.12.3)
         | 
| 105 144 | 
             
                  diff-lcs (>= 1.2.0, < 2.0)
         | 
| 106 | 
            -
                  rspec-support (~> 3. | 
| 107 | 
            -
                rspec-mocks (3. | 
| 145 | 
            +
                  rspec-support (~> 3.12.0)
         | 
| 146 | 
            +
                rspec-mocks (3.12.5)
         | 
| 108 147 | 
             
                  diff-lcs (>= 1.2.0, < 2.0)
         | 
| 109 | 
            -
                  rspec-support (~> 3. | 
| 110 | 
            -
                rspec-support (3. | 
| 111 | 
            -
                 | 
| 148 | 
            +
                  rspec-support (~> 3.12.0)
         | 
| 149 | 
            +
                rspec-support (3.12.0)
         | 
| 150 | 
            +
                sqlite3 (1.6.3)
         | 
| 151 | 
            +
                  mini_portile2 (~> 2.8.0)
         | 
| 152 | 
            +
                thor (1.2.2)
         | 
| 153 | 
            +
                timeout (0.3.2)
         | 
| 154 | 
            +
                tzinfo (2.0.6)
         | 
| 112 155 | 
             
                  concurrent-ruby (~> 1.0)
         | 
| 113 | 
            -
             | 
| 114 | 
            -
                sprockets-rails (3.2.1)
         | 
| 115 | 
            -
                  actionpack (>= 4.0)
         | 
| 116 | 
            -
                  activesupport (>= 4.0)
         | 
| 117 | 
            -
                  sprockets (>= 3.0.0)
         | 
| 118 | 
            -
                sqlite3 (1.4.2)
         | 
| 119 | 
            -
                thor (1.0.1)
         | 
| 120 | 
            -
                thread_safe (0.3.6)
         | 
| 121 | 
            -
                tzinfo (1.2.7)
         | 
| 122 | 
            -
                  thread_safe (~> 0.1)
         | 
| 123 | 
            -
                websocket-driver (0.7.1)
         | 
| 156 | 
            +
                websocket-driver (0.7.5)
         | 
| 124 157 | 
             
                  websocket-extensions (>= 0.1.0)
         | 
| 125 | 
            -
                websocket-extensions (0.1. | 
| 158 | 
            +
                websocket-extensions (0.1.5)
         | 
| 159 | 
            +
                zeitwerk (2.6.8)
         | 
| 126 160 |  | 
| 127 161 | 
             
            PLATFORMS
         | 
| 128 162 | 
             
              ruby
         | 
| 129 163 |  | 
| 130 164 | 
             
            DEPENDENCIES
         | 
| 131 | 
            -
              actionpack (~>  | 
| 132 | 
            -
              rails (~>  | 
| 165 | 
            +
              actionpack (~> 7.0)
         | 
| 166 | 
            +
              rails (~> 7.0)
         | 
| 133 167 | 
             
              rake (~> 13.0)
         | 
| 134 | 
            -
              rspec (~> 3. | 
| 135 | 
            -
              sqlite3 (~> 1. | 
| 168 | 
            +
              rspec (~> 3.12)
         | 
| 169 | 
            +
              sqlite3 (~> 1.6.3)
         | 
| 136 170 |  | 
| 137 171 | 
             
            BUNDLED WITH
         | 
| 138 | 
            -
                | 
| 172 | 
            +
               2.3.7
         |