diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85f0d7b..d4f298b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,13 +52,15 @@ jobs: bundler-cache: true - name: Run RSpec run: bundle exec rspec - - name: Run RSpec examples - run: ruby examples/rspec.rb - - name: Fix RubyGems activating older versions of gems - run: gem install timeout net-protocol stringio psych date + - name: Install RSpec example dependencies + run: bundle install --gemfile ./examples/Gemfile-rspec + - name: Run RSpec example + run: bundle exec --gemfile ./examples/Gemfile-rspec ruby examples/rspec.rb + - name: Install minitest example dependencies + run: bundle install --gemfile ./examples/Gemfile-minitest - name: Run minitest example - run: ruby examples/minitest.rb - - name: Run RSpec Rails examples + run: bundle exec --gemfile ./examples/Gemfile-minitest ruby examples/minitest.rb + - name: Run RSpec Rails example working-directory: ./examples/rails_app run: | bundle install diff --git a/.gitignore b/.gitignore index 5c249f1..d44e26c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ .rspec_status Gemfile.lock +/examples/*.lock diff --git a/examples/Gemfile-minitest b/examples/Gemfile-minitest new file mode 100644 index 0000000..f2f283c --- /dev/null +++ b/examples/Gemfile-minitest @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "minitest" +gem "rack-test" +gem "skooma", (ENV["CI"] == "1") ? {path: File.join(__dir__, "..")} : {} +gem "sinatra" diff --git a/examples/Gemfile-rspec b/examples/Gemfile-rspec new file mode 100644 index 0000000..4deb062 --- /dev/null +++ b/examples/Gemfile-rspec @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "rspec" +gem "rack-test" +gem "skooma", (ENV["CI"] == "1") ? {path: File.join(__dir__, "..")} : {} +gem "sinatra" diff --git a/examples/minitest.rb b/examples/minitest.rb index a8b7a8f..bf74907 100644 --- a/examples/minitest.rb +++ b/examples/minitest.rb @@ -1,15 +1,5 @@ # frozen_string_literal: true -require "bundler/inline" - -gemfile do - source "https://rubygems.org" - gem "minitest" - gem "rack-test" - gem "skooma", (ENV["CI"] == "1") ? {path: File.join(__dir__, "..")} : {} - gem "sinatra" -end - require_relative "test_app" require "minitest/autorun" diff --git a/examples/rspec.rb b/examples/rspec.rb index 58d23e9..2764dbb 100644 --- a/examples/rspec.rb +++ b/examples/rspec.rb @@ -1,18 +1,7 @@ -# frozen_string_literal: true - -require "bundler/inline" - -gemfile do - source "https://rubygems.org" - gem "rspec" - gem "rack-test" - gem "skooma", (ENV["CI"] == "1") ? {path: File.join(__dir__, "..")} : {} - gem "sinatra" -end - require_relative "test_app" require "rspec/autorun" +require "rack/test" require "skooma" RSpec.configure do |config| diff --git a/lib/skooma/minitest.rb b/lib/skooma/minitest.rb index fc0d98b..e20acf7 100644 --- a/lib/skooma/minitest.rb +++ b/lib/skooma/minitest.rb @@ -39,7 +39,7 @@ def assert_is_valid_document(document) def initialize(openapi_path, **params) super(HelperMethods, openapi_path, **params) - MiniTest.after_run { coverage.report } + ::Minitest.after_run { coverage.report } end end end