Merge pull request #301 from DanMegaGamer/fix-ci

Fix broken tests and add Github workflow CI

Author: DanMegaGamer

.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: rspec
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.6", "2.7", "3.0"]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        # uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rspec

.travis.yml

@@ -1,7 +1,7 @@
 capybara-screenshot gem
 =======================
 
-[![Build Status](https://travis-ci.org/mattheworiordan/capybara-screenshot.svg)](https://travis-ci.org/mattheworiordan/capybara-screenshot)
+[![Build Status](https://github.com/mattheworiordan/capybara-screenshot/actions/workflows/ci.yml/badge.svg)](https://github.com/mattheworiordan/capybara-screenshot/actions/workflows/ci.yml)
 [![Code Climate](https://d3s6mut3hikguw.cloudfront.net/github/mattheworiordan/capybara-screenshot.svg)](https://codeclimate.com/github/mattheworiordan/capybara-screenshot)
 [![Gem Version](https://badge.fury.io/rb/capybara-screenshot.svg)](http://badge.fury.io/rb/capybara-screenshot)
 
@@ -319,7 +319,7 @@ Please raise an issue at [https://github.com/mattheworiordan/capybara-screenshot
 
 #### Contributions
 
-Contributions are welcome.  Please fork this gem and then submit a pull request.  New features must include test coverage and must pass on all versions of the testing frameworks supported.  Run `appraisal` to set up the your Gems. then `appraisal "rake travis:ci"` locally to test your changes against all versions of testing framework gems supported.
+Contributions are welcome.  Please fork this gem and then submit a pull request.  New features must include test coverage and must pass on all versions of the testing frameworks supported.  Run `appraisal` to set up the your Gems. then `appraisal "rspec"` locally to test your changes against all versions of testing framework gems supported.
 
 #### Rubygems
 

README.md

@@ -1,40 +1,6 @@
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
-
-rspec_rake_task = RSpec::Core::RakeTask.new(:spec)
-
-task default: [:spec]
-
-def target_gem
-  gem_file = ENV['BUNDLE_GEMFILE'] || ''
-  targets = %w(cucumber spinach rspec)
-
-  target = gem_file.match(/(#{targets.join('|')})/)
-  if target && targets.include?(target[1])
-    target[1].to_sym
-  else
-    []
-  end
-end
-
-namespace :travis do
-  task :ci => target_gem do
-    Rake::Task['spec'].invoke
-  end
-
-  task :cucumber do
-    rspec_rake_task.pattern = 'spec/cucumber'
-  end
-
-  task :spinach do
-    rspec_rake_task.pattern = 'spec/spinach'
-  end
-
-  task :rspec do
-    rspec_rake_task.pattern = 'spec/rspec'
-  end
-end
+require "rspec/core/rake_task"

Rakefile

@@ -28,7 +28,7 @@ def run_failing_case(code)
 
   it 'saves a screenshot on failure' do
     run_failing_case <<-RUBY
-      class TestFailure < MiniTest::Unit::TestCase
+      class TestFailure < Minitest::Test
         include Capybara::DSL
 
         def test_failure
@@ -43,7 +43,7 @@ def test_failure
 
   it 'saves a screenshot for the correct session for failures using_session' do
     run_failing_case <<-RUBY
-      class TestFailure < Minitest::Unit::TestCase
+      class TestFailure < Minitest::Test
         include Capybara::DSL
 
         def test_failure
@@ -64,7 +64,7 @@ def test_failure
     create_screenshot_for_pruning
     configure_prune_strategy :last_run
     run_failing_case <<-RUBY
-      class TestFailure < Minitest::Unit::TestCase
+      class TestFailure < Minitest::Test
         include Capybara::DSL
 
         def test_failure

spec/feature/minitest_spec.rb

@@ -135,9 +135,11 @@
       expect(File).to receive(:open).with(html_path).and_yield(html_file)
 
       expect(s3_client).to receive(:put_object).with(
-        bucket: bucket_name,
-        key: 'bar.html',
-        body: html_file
+        {
+          bucket: bucket_name,
+          key: "bar.html",
+          body: html_file
+        }
       )
 
       expect(s3_saver).to receive(:determine_bucket_host).and_call_original
@@ -155,9 +157,11 @@
       expect(File).to receive(:open).with(screenshot_path).and_yield(screenshot_file)
 
       expect(s3_client).to receive(:put_object).with(
-        bucket: bucket_name,
-        key: 'bim.jpg',
-        body: screenshot_file
+        {
+          bucket: bucket_name,
+          key: "bim.jpg",
+          body: screenshot_file
+        }
       )
 
       s3_saver.save
@@ -177,10 +181,12 @@
         expect(File).to receive(:open).with(html_path).and_yield(html_file)
 
         expect(s3_client).to receive(:put_object).with(
-          bucket: bucket_name,
-          key: 'bar.html',
-          body: html_file,
-          acl: 'public-read'
+          {
+            bucket: bucket_name,
+            key: "bar.html",
+            body: html_file,
+            acl: "public-read"
+          }
         )
 
         s3_saver.save
@@ -196,10 +202,12 @@
         expect(File).to receive(:open).with(screenshot_path).and_yield(screenshot_file)
 
         expect(s3_client).to receive(:put_object).with(
-          bucket: bucket_name,
-          key: 'bim.jpg',
-          body: screenshot_file,
-          acl: 'public-read'
+          {
+            bucket: bucket_name,
+            key: "bim.jpg",
+            body: screenshot_file,
+            acl: "public-read"
+          }
         )
 
         s3_saver.save
@@ -217,9 +225,11 @@
         expect(File).to receive(:open).with(html_path).and_yield(html_file)
 
         expect(s3_client).to receive(:put_object).with(
-          bucket: bucket_name,
-          key: 'some/path/bar.html',
-          body: html_file
+          {
+            bucket: bucket_name,
+            key: "some/path/bar.html",
+            body: html_file
+          }
         )
 
         s3_saver_with_key_prefix.save
@@ -235,9 +245,11 @@
         expect(File).to receive(:open).with(screenshot_path).and_yield(screenshot_file)
 
         expect(s3_client).to receive(:put_object).with(
-          bucket: bucket_name,
-          key: 'some/path/bim.jpg',
-          body: screenshot_file
+          {
+            bucket: bucket_name,
+            key: "some/path/bim.jpg",
+            body: screenshot_file
+          }
         )
 
         s3_saver_with_key_prefix.save
@@ -256,10 +268,12 @@
           expect(File).to receive(:open).with(html_path).and_yield(html_file)
 
           expect(s3_client).to receive(:put_object).with(
-            bucket: bucket_name,
-            key: 'some/path/bar.html',
-            body: html_file,
-            acl: 'public-read'
+            {
+              bucket: bucket_name,
+              key: "some/path/bar.html",
+              body: html_file,
+              acl: "public-read"
+            }
           )
 
           s3_saver_with_key_prefix.save
@@ -275,10 +289,12 @@
           expect(File).to receive(:open).with(screenshot_path).and_yield(screenshot_file)
 
           expect(s3_client).to receive(:put_object).with(
-            bucket: bucket_name,
-            key: 'some/path/bim.jpg',
-            body: screenshot_file,
-            acl: 'public-read'
+            {
+              bucket: bucket_name,
+              key: "some/path/bim.jpg",
+              body: screenshot_file,
+              acl: "public-read"
+            }
           )
 
           s3_saver_with_key_prefix.save