hanami-rspec 2.3.1 → 3.11.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2185e39d0b525de7f16d338057a0e2f87b1b2537663c63f0d0f2f9ddc09741
-  data.tar.gz: 691c5b210355c983af3a879dca1cf69cfbb6197b6c7151a76d37d78b002748c4
+  metadata.gz: bb274d263b143f47cda8bf26d3e064125d57dea50a5be98b0b5182e6a952d186
+  data.tar.gz: e98375c2ef0d2974a1982989694e5873377bb1b5cafccf159477e5e90e963657
 SHA512:
-  metadata.gz: 79f9422d2a433e90b9b4cf0bc2a8e963c12869004aeac391425c1f23413d5b3c78f04683ba5bd44f10ec74a74c31a9ae99c7fee7f5c96c2e377efbe665b822eb
-  data.tar.gz: 146c5ee5983d235ddd02a8263d74c67c13acf8e1f58e491c9c068ee0383f6e56e3e7972de2ba47ada5db3b5bca2f1e8cce00e8d11c4dfbb04b43dfa12a6974ac
+  metadata.gz: 89e4a5322a0f7bafd4c8abbfd94f8edaf0e7f9ff617ac65f543ce8d2232dbdc40c33618ca3061f93b092359a0c83ea29c42039b9c64976bb6e810dceac7813fe
+  data.tar.gz: 8049790bcf4437f5363c94af6d41a58be5b90a5c02cea61c4f6b274180f6559a00b1271a7d566b8ef6a52c36c6304c2c24f9c9c7e25d9abdc95b360a48a56d40

data/.github/workflows/ci.yml

@@ -1,11 +1,19 @@
 name: ci
 
-on:
+'on':
   push:
+    paths:
+      - '.github/workflows/ci.yml'
+      - 'lib/**'
+      - '*.gemspec'
+      - 'spec/**'
+      - 'Rakefile'
+      - 'Gemfile'
+      - '.rubocop.yml'
   pull_request:
+    branches:
+      - master
   create:
-  schedule:
-    - cron: "30 4 * * *"
 
 jobs:
   tests:
@@ -14,14 +22,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - "4.0"
-          - "3.4"
-          - "3.3"
-          - "3.2"
+          - '3.0'
     steps:
       - uses: actions/checkout@v1
       - name: Install package dependencies
-        run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
+        run: '[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS'
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -33,11 +38,3 @@ jobs:
         run: bundle install --jobs 4 --retry 3
       - name: Run all tests
         run: bundle exec rake
-
-  workflow-keepalive:
-    if: github.event_name == 'schedule'
-    runs-on: ubuntu-latest
-    permissions:
-      actions: write
-    steps:
-      - uses: liskin/gh-workflow-keepalive@v1

data/.rubocop.yml

@@ -16,8 +16,6 @@ Style/BlockDelimiters:
   Enabled: false
 Style/CommentedKeyword:
   Enabled: false
-Style/HashSyntax:
-  EnforcedShorthandSyntax: either_consistent
 Style/LambdaCall:
   Enabled: false
 Style/TrailingCommaInArguments:

data/CHANGELOG.md

@@ -1,184 +1,5 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-### Added
-
-### Changed
-
-### Deprecated
-
-### Removed
-
-### Fixed
-
-### Security
-
-[Unreleased]: https://github.com/hanami/rspec/compare/v2.3.0...HEAD
-
-## [2.3.1] - 2026-01-23
-
-### Fixed
-
-- Allow command callbacks to run with both Dry CLI 1.3 and 1.4 (1.4 corrects a longstanding bug regarding argument passing to command callbacks, which we had previously worked around here). (@timriley in #41)
-
-## [2.3.0] - 2025-11-12
-
-[2.3.0]: https://github.com/hanami/rspec/compare/v2.3.0.beta2...v2.3.0
-
-## [2.3.0.beta2] - 2025-10-17
-
-### Changed
-
-- Drop support for Ruby 3.1
-
-[2.3.0.beta2]: https://github.com/hanami/rspec/compare/v2.3.0.beta1...v2.3.0.beta2
-
-## [2.3.0.beta1] - 2025-10-03
-
-### Changed
-
-- [Aaron Allen] Change shared context name in generated `spec/support/requests.rb` to avoid a RuboCop RSpec offense (#40)
-
-[2.3.0.beta1]: https://github.com/hanami/rspec/compare/v2.2.1...v2.3.0.beta1
-
-## [2.2.1] - 2024-11-12
-
-### Changed
-
-- [Tim Riley] Modify `Gemfile` via a `before "install"` hook on the `hanami` CLI. This ensures that testing-related gems are installed as part of running `hanami new` (#30)
-
-[2.2.1]: https://github.com/hanami/rspec/compare/v2.2.0...v2.2.1
-
-## [2.2.0] - 2024-11-05
-
-### Changed
-
-- [Paweł Świątkowski, Seb Wilgosz] Only enhance `generate` CLI commands if the relevant gems are bundled (#29)
-
-[2.2.0]: https://github.com/hanami/rspec/compare/v2.2.0.rc1...v2.2.0
-
-## [2.2.0.rc1] - 2024-10-29
-
-### Added
-
-- [Tim Riley] As part of `hanami install`, add `database_cleaner-sequel` to the `Gemfile` and generate DatabaseCleaner configuration in `spec/support/db.rb` and `spec/support/db/cleaning.rb` (#28)
-
-### Changed
-
-- [Seb Wilgosz] Only enhance `generate` CLI commands if the relevant gems are bundled (#26)
-
-[2.2.0.rc1]: https://github.com/hanami/rspec/compare/v2.2.0.beta1...v2.2.0.rc1
-
-## [2.2.0.beta1] - 2024-07-16
-
-### Added
-
-- [Sean Collins] Include `Dry::Monads[:result]` in tests via `support/operations.rb`
-
-### Changed
-
-- Drop support for Ruby 3.0
-- [Sean Collins] In generated `spec_helper.rb`, require all files under `spec/support/` in a loop, rather than via manual requires (#24)
-
-[2.2.0.beta1]: https://github.com/hanami/rspec/compare/v2.1.0...v2.2.0.beta1
-
-## [2.1.0] - 2024-02-27
-
-[2.1.0]: https://github.com/hanami/rspec/compare/v2.1.0.rc3...v2.1.0
-
-## [2.1.0.rc3] - 2024-02-16
-
-[2.1.0.rc3]: https://github.com/hanami/rspec/compare/v2.1.0.rc2...v2.1.0.rc3
-
-## [2.1.0.rc2] - 2023-11-08
-
-### Added
-
-- [Tim Riley] Skip generating tests for `hanami generate` when `--skip-tests` CLI option is given
-- [Tim Riley] Install Capybara and generate `spec/support/capybara.rb` in `hanami install` hook
-
-### Changed
-
-- [Tim Riley] Add explanatory code comments to `spec/support/rspec.rb` generated in `hanami install` hook
-
-[2.1.0.rc2]: https://github.com/hanami/rspec/compare/v2.1.0.rc1...v2.1.0.rc2
-
-## [2.1.0.rc1] - 2023-11-01
-
-### Added
-
-- [Luca Guidi] Generate spec for `hanami generate part` command
-
-### Changed
-
-- [Luca Guidi] Default request spec to expect 404, now that `hanami new` doesn't generate a default root route anymore
-
-[2.1.0.rc1]: https://github.com/hanami/rspec/compare/v2.1.0.beta1...v2.1.0.rc1
-
-## [2.1.0.beta1] - 2023-06-29
-
-[2.1.0.beta1]: https://github.com/hanami/rspec/compare/v2.0.1...v2.1.0.beta1
-
-## [2.0.1] - 2022-12-25
-
-### Added
-
-- [Luca Guidi] Official support for Ruby 3.2
-
-[2.0.1]: https://github.com/hanami/rspec/compare/v2.0.0...v2.0.1
-
-## [2.0.0] - 2022-11-22
-
-### Added
-
-- [Tim Riley] Use Zeitwerk to autoload the gem
-- [Luca Guidi] Support RSpec 3.12
-
-[2.0.0]: https://github.com/hanami/rspec/compare/v2.0.0.rc1...v2.0.0
-
-## [2.0.0.rc1] - 2022-11-08
-
-### Changed
-
-- [Luca Guidi] Follow `hanami` versioning
-
-[2.0.0.rc1]: https://github.com/hanami/rspec/compare/v3.11.0.beta4...v2.0.0.rc1
-
-## [3.11.0.beta4] - 2022-10-24
-
-### Changed
-
-- [Luca Guidi] Generate slice specs under `spec/slices/[slice_name]/` (#9)
-
-[3.11.0.beta4]: https://github.com/hanami/rspec/compare/v3.11.0.beta3...v3.11.0.beta4
-
-## [3.11.0.beta3] - 2022-09-21
-
-### Added
-
-- [Luca Guidi] Hook into `hanami new` and `hanami generate` to respect name pluralization
-- [Luca Guidi] Hook into `hanami generate action` to generate action specs
-
-[3.11.0.beta3]: https://github.com/hanami/rspec/compare/v3.11.0.beta2...v3.11.0.beta3
-
-## [3.11.0.beta2] - 2022-08-16
-
-### Added
-
-- [Luca Guidi] Hook into `hanami generate slice` to generate a slice directory in spec/ along with a placeholder base action spec (#5)
-
-[3.11.0.beta2]: https://github.com/hanami/rspec/compare/v3.11.0.beta1...v3.11.0.beta2
-
-## [3.11.0.beta1] - 2022-07-20
+## v3.11.0.beta1 - 2022-07-20
 
 ### Added
 
 - [Luca Guidi] Hook into `hanami install` to setup RSpec + Rack::Test
-
-[3.11.0.beta1]: https://github.com/hanami/rspec/releases/tag/v3.11.0.beta1

data/Gemfile

@@ -4,10 +4,10 @@ source "https://rubygems.org"
 gemspec
 
 unless ENV["CI"]
-  gem "byebug", platforms: :mri
-  gem "yard"
+  gem "byebug", require: false, platforms: :mri
+  gem "yard",   require: false
 end
 
-gem "hanami-utils", github: "hanami/utils", branch: "main"
-gem "hanami-cli", github: "hanami/cli", branch: "main"
-gem "hanami", github: "hanami/hanami", branch: "main"
+gem "dry-files", require: false, git: "https://github.com/dry-rb/dry-files.git", branch: "main"
+gem "hanami-cli", require: false, git: "https://github.com/hanami/cli.git", branch: "main"
+gem "hanami", require: false, git: "https://github.com/hanami/hanami.git", branch: "main"

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Luca Guidi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,19 +1,29 @@
 # Hanami::RSpec
 
-RSpec and testing support for [Hanami applications](https://github.com/hanami/hanami).
+RSpec and testing support for [full-stack Hanami applications](`https://github.com/hanami/hanami`).
 
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/hanami-rspec.svg)](https://badge.fury.io/rb/hanami-rspec)
-[![CI](https://github.com/hanami/rspec/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/hanami/rspec/actions?query=workflow%3Aci+branch%3Amain)
+[![CI](https://github.com/hanami/rspec/workflows/ci/badge.svg?branch=main)](https://github.com/hanami/rspec/actions?query=workflow%3Aci+branch%3Amain)
+[![Depfu](https://badges.depfu.com/badges/a8545fb67cf32a2c75b6227bc0821027/overview.svg)](https://depfu.com/github/hanami/rspec?project=Bundler)
+
+## Version
+
+Versioning of this gem follows RSpec.
 
 ## Contact
 
 - Home page: http://hanamirb.org
 - Mailing List: http://hanamirb.org/mailing-list
 - Bugs/Issues: https://github.com/hanami/rspec/issues
+- Support: http://stackoverflow.com/questions/tagged/hanami
 - Chat: http://chat.hanamirb.org
 
+## Rubies
+
+**Hanami::RSpec** supports Ruby (MRI) 3.0+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -26,10 +36,10 @@ end
 
 And then execute:
 
-```
-$ bundle install
-$ bundle exec hanami setup
-```
+    $ bundle install
+    $ bundle exec hanami setup
+
+## Usage
 
 ## Development
 
@@ -51,4 +61,4 @@ Everyone interacting in the `Hanami::RSpec` project's codebases, issue trackers,
 
 ## Copyright
 
-Copyright © 2014–2024 Hanami Team – Released under MIT License
+Copyright © 2014-2022 Hanami Team – Released under MIT License

data/hanami-rspec.gemspec

@@ -5,14 +5,14 @@ require_relative "lib/hanami/rspec/version"
 Gem::Specification.new do |spec|
   spec.name          = "hanami-rspec"
   spec.version       = Hanami::RSpec::VERSION
-  spec.authors       = ["Hanakai team"]
-  spec.email         = ["info@hanakai.org"]
+  spec.authors       = ["Luca Guidi"]
+  spec.email         = ["me@lucaguidi.com"]
 
   spec.summary       = "Hanami RSpec"
   spec.description   = "Hanami RSpec generators and Rake tasks"
   spec.homepage      = "https://hanamirb.org"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 3.2"
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
@@ -29,10 +29,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "hanami-cli", "~> 2.3.0"
-  spec.add_dependency "rspec", "~> 3.12"
+  spec.add_dependency "hanami-cli", "~> 2.0.0.alpha"
+  spec.add_dependency "rspec", "~> 3.11"
   spec.add_dependency "rake", "~> 13.0"
-  spec.add_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "rubocop", "~> 1.11"
   spec.metadata["rubygems_mfa_required"] = "true"

data/lib/hanami/rspec/commands.rb

@@ -1,26 +1,19 @@
 # frozen_string_literal: true
 
+require "hanami/cli"
 require "shellwords"
+require "hanami/cli/generators/context"
+require_relative "./generators"
 
 module Hanami
   module RSpec
-    # @since 2.0.0
-    # @api private
     module Commands
-      # @since 2.0.0
-      # @api private
       class Install < Hanami::CLI::Command
-        # @since 2.0.0
-        # @api private
         def call(*, **)
           append_gemfile
-          append_gitignore
           copy_dotrspec
           copy_spec_helper
           copy_support_rspec
-          copy_support_db
-          copy_support_features
-          copy_support_operations
           copy_support_requests
 
           generate_request_spec
@@ -29,18 +22,11 @@ module Hanami
         private
 
         def append_gemfile
-          gemfile_template = Hanami.bundled?("hanami-db") ? "gemfile_db" : "gemfile"
-
           fs.append(
             fs.expand_path("Gemfile"),
-            fs.read(fs.expand_path(fs.join("generators", gemfile_template), __dir__))
-          )
-        end
-
-        def append_gitignore
-          fs.append(
-            fs.expand_path(".gitignore"),
-            fs.read(fs.expand_path(fs.join("generators", "gitignore"), __dir__))
+            fs.read(
+              fs.expand_path(fs.join("generators", "gemfile"), __dir__)
+            ),
           )
         end
 
@@ -65,34 +51,6 @@ module Hanami
           )
         end
 
-        def copy_support_db
-          return unless Hanami.bundled?("hanami-db")
-
-          fs.cp(
-            fs.expand_path(fs.join("generators/support_db.rb"), __dir__),
-            fs.expand_path(fs.join("spec", "support", "db.rb"))
-          )
-
-          fs.cp(
-            fs.expand_path(fs.join("generators/support_db_cleaning.rb"), __dir__),
-            fs.expand_path(fs.join("spec", "support", "db", "cleaning.rb"))
-          )
-        end
-
-        def copy_support_features
-          fs.cp(
-            fs.expand_path(fs.join("generators", "support_features.rb"), __dir__),
-            fs.expand_path(fs.join("spec", "support", "features.rb"))
-          )
-        end
-
-        def copy_support_operations
-          fs.cp(
-            fs.expand_path(fs.join("generators", "support_operations.rb"), __dir__),
-            fs.expand_path(fs.join("spec", "support", "operations.rb"))
-          )
-        end
-
         def copy_support_requests
           fs.cp(
             fs.expand_path(fs.join("generators", "support_requests.rb"), __dir__),
@@ -108,91 +66,23 @@ module Hanami
         end
       end
 
-      # @since 2.0.0
-      # @api private
       module Generate
-        # @since 2.0.0
-        # @api private
         class Slice < Hanami::CLI::Command
-          # @since 2.0.0
-          # @api private
-          def call(options = nil, name: nil, **)
-            # Support multiple calling conventions for dry-cli cross-version compatibility:
-            #
-            # - dry-cli 1.3 calls with positional hash: call({name: "foo"})
-            # - dry-cli 1.4+: calls with keyword arguments: call(name: "foo")
-            #
-            # TODO: Remove this with Hanami 2.4 (which will require dry-cli 1.4+).
-            if options.is_a?(Hash)
-              name = options[:name]
-            end
-
-            slice = inflector.underscore(Shellwords.shellescape(name))
+          # FIXME: dry-cli kwargs aren't correctly forwarded in Ruby 3
+          def call(options, **)
+            slice = inflector.underscore(Shellwords.shellescape(options[:name]))
 
+            out.puts "generating #{slice} (rspec)"
             generator = Generators::Slice.new(fs: fs, inflector: inflector)
             generator.call(slice)
           end
         end
-
-        # @since 2.0.0
-        # @api private
-        class Action < Hanami::CLI::Commands::App::Command
-          # @since 2.0.0
-          # @api private
-          def call(options = nil, name: nil, slice: nil, skip_tests: false, **)
-            # Support multiple calling conventions for dry-cli cross-version compatibility:
-            #
-            # - dry-cli 1.3 calls with positional hash: call({name: "foo"})
-            # - dry-cli 1.4+: calls with keyword arguments: call(name: "foo")
-            #
-            # TODO: Remove this with Hanami 2.4 (which will require dry-cli 1.4+).
-            if options.is_a?(Hash)
-              name = options[:name]
-              slice = options[:slice]
-              skip_tests = options[:skip_tests] || false
-            end
-
-            return if skip_tests
-
-            slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
-            key = inflector.underscore(Shellwords.shellescape(name))
-
-            namespace = slice ? inflector.camelize(slice) : app.namespace
-            base_path = slice ? "spec/slices/#{slice}" : "spec"
-
-            generator = Generators::Action.new(fs:, inflector:)
-            generator.call(key:, namespace:, base_path:)
-          end
-        end
-
-        # @since 2.1.0
-        # @api private
-        class Part < Hanami::CLI::Commands::App::Command
-          # @since 2.1.0
-          # @api private
-          def call(options = nil, name: nil, slice: nil, skip_tests: false, **)
-            # Support multiple calling conventions for dry-cli cross-version compatibility:
-            #
-            # - dry-cli 1.3 calls with positional hash: call({name: "foo"})
-            # - dry-cli 1.4+: calls with keyword arguments: call(name: "foo")
-            #
-            # TODO: Remove this with Hanami 2.4 (which will require dry-cli 1.4+).
-            if options.is_a?(Hash)
-              name = options[:name]
-              slice = options[:slice]
-              skip_tests = options[:skip_tests] || false
-            end
-
-            return if skip_tests
-
-            slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
-            name = inflector.underscore(Shellwords.shellescape(name))
-
-            generator = Generators::Part.new(fs: fs, inflector: inflector)
-            generator.call(app.namespace, slice, name)
-          end
-        end
       end
     end
   end
 end
+
+if Hanami::CLI.within_hanami_app?
+  Hanami::CLI.after "install", Hanami::RSpec::Commands::Install
+  # Hanami::CLI.after "generate slice", Hanami::RSpec::Commands::Generate::Slice
+end

data/lib/hanami/rspec/error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Hanami
+  module RSpec
+    class Error < StandardError
+    end
+  end
+end

data/lib/hanami/rspec/generators/gemfile

@@ -1,6 +1,4 @@
 
 group :test do
-  # Web integration
-  gem "capybara"
   gem "rack-test"
 end

data/lib/hanami/rspec/generators/helper.rb

@@ -6,4 +6,5 @@ SPEC_ROOT = Pathname(__dir__).realpath.freeze
 ENV["HANAMI_ENV"] ||= "test"
 require "hanami/prepare"
 
-SPEC_ROOT.glob("support/**/*.rb").each { |f| require f }
+require_relative "support/rspec"
+require_relative "support/requests"

data/lib/hanami/rspec/generators/request.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe "Root", type: :request do
-  it "is not found" do
+  it "is successful" do
     get "/"
 
-    # Generate new action via:
-    #   `bundle exec hanami generate action home.index --url=/`
-    expect(last_response.status).to be(404)
+    # Find me in `config/routes.rb`
+    expect(last_response).to be_successful
+    expect(last_response.body).to eq("Hello from Hanami")
   end
 end

data/lib/hanami/rspec/generators/slice/action_spec.erb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe <%= camelized_slice_name %>::Action do
-  xit "works"
+require "slices/<%= underscored_slice_name %>/action"
+
+RSpec.describe <%= classified_slice_name %>::Action do
 end

data/lib/hanami/rspec/generators/slice/repository_spec.erb

@@ -2,5 +2,5 @@
 
 require "slices/<%= underscored_slice_name %>/repository"
 
-RSpec.describe <%= camelized_slice_name %>::Repository do
+RSpec.describe <%= classified_slice_name %>::Repository do
 end

data/lib/hanami/rspec/generators/slice/view_spec.erb

@@ -2,5 +2,5 @@
 
 require "slices/<%= underscored_slice_name %>/view"
 
-RSpec.describe <%= camelized_slice_name %>::View do
+RSpec.describe <%= classified_slice_name %>::View do
 end