Merge pull request #29 from PopularPays/support/rails_7

 Bump ActiveSupport to 7.0

.github/workflows/ruby.yml

@@ -21,10 +21,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1.152.0
       with:
-        ruby-version: 2.6
-        bundler: 2.1.4
+        ruby-version: 3.1.4
+        bundler-cache: true
     - name: Install dependencies
       run: bundle install
     - name: Run tests

jsonapi-matchers.gemspec

@@ -18,11 +18,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 4.0", "< 7"
+  spec.required_ruby_version = ">= 2.7.8"
+
+  spec.add_dependency "activesupport", ">= 4.0", "< 7.1"
   spec.add_dependency "awesome_print"
 
   spec.add_development_dependency "bump", "~> 0.9.0"
-  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"

lib/jsonapi/matchers/version.rb

@@ -1,5 +1,5 @@
 module Jsonapi
   module Matchers
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

spec/jsonapi/record_included_spec.rb

@@ -27,13 +27,17 @@
     let(:subject) { have_record(record) }
     let(:response) { ActionDispatch::TestResponse.new(response_data) }
     let(:response_data) { '{' }
+    let(:architecture) { `uname -m`.strip }
+    let(:arm_expectation) { /Expected response to be json string but was \"{\". JSON::ParserError - unexpected token at '{'/ }
+    let(:linux_expectation) { /Expected response to be json string but was \"{\". JSON::ParserError - \d\d\d: unexpected token at '{'/ }
 
     before do
       subject.matches?(response)
     end
 
     it 'tells you that the response body is not json' do
-      expect(subject.failure_message).to match(/Expected response to be json string but was \"{\". JSON::ParserError - \d\d\d: unexpected token at '{'/)
+      expectation = architecture == 'arm64' ? arm_expectation : linux_expectation
+      expect(subject.failure_message).to match(expectation)
     end
   end