Merge pull request #71 from st0012/improve-ci-setup

Support Ruby 3.0

.github/workflows/ruby.yml

@@ -1,16 +1,24 @@
 name: Ruby
 
-on: [push, pull_request]
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   test:
     name: Test on ruby ${{ matrix.ruby_version }} and rails ${{ matrix.rails_version }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rails_version: ['5.2', '6']
-        ruby_version: ['2.5', '2.6']
+        rails_version: ['5.2', '6.0.0', '6.1.0']
+        ruby_version: ['2.7', '3.0']
         os: [ubuntu-latest]
+        exclude:
+          - ruby_version: '3.0'
+            rails_version: '5.2'
     steps:
     - uses: actions/checkout@v1
 

.gitignore

@@ -7,5 +7,7 @@
 /spec/reports/
 /tmp/
 
+Gemfile.lock
+
 # rspec failure tracking
 .rspec_status

.ruby-version

@@ -1 +1 @@
-2.6.5
+3.0.1

lib/tapping_device/method_hijacker.rb

@@ -20,10 +20,14 @@ def hijack_methods!
 
     def is_writer_method?(method_name)
       has_definition_source?(method_name) && method_name.match?(/\w+=/) && target.method(method_name).source.match?(/attr_writer|attr_accessor/)
+    rescue MethodSource::SourceNotFoundError
+      false
     end
 
     def is_reader_method?(method_name)
       has_definition_source?(method_name) && target.method(method_name).source.match?(/attr_reader|attr_accessor/)
+    rescue MethodSource::SourceNotFoundError
+      false
     end
 
     def has_definition_source?(method_name)

spec/spec_helper.rb

@@ -35,20 +35,4 @@
   config.after do
     TappingDevice.reset!
   end
-
-  def assert_query_count(number, print_queries = true)
-    queries = []
-
-    ActiveSupport::Notifications.subscribe('sql.active_record') do |_1, _2, _3, _4, payload|
-      if !["SCHEMA", "TRANSACTION"].include? payload.name
-        queries << payload.sql
-      end
-    end
-
-    yield
-
-    puts(queries) if print_queries && (number != queries.count)
-
-    expect(queries.count).to eq(number), "Expect #{number} queries, got #{queries.count}"
-  end
 end