diff --git a/Gemfile b/Gemfile index 45c6ef0..ef4ed18 100644 --- a/Gemfile +++ b/Gemfile @@ -9,8 +9,6 @@ gemspec gem 'appraisal' gem 'rake' gem 'rspec', '~> 3.6' -gem 'rspec-collection_matchers' -gem 'rspec-its' gem 'webmock', '~> 3.0' gem 'rake-release', '~> 1.0' diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile index 1fc3bda..9375471 100644 --- a/gemfiles/rails_7.2.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -5,8 +5,6 @@ source "https://rubygems.org" gem "appraisal" gem "rake" gem "rspec", "~> 3.6" -gem "rspec-collection_matchers" -gem "rspec-its" gem "webmock", "~> 3.0" gem "rake-release", "~> 1.0" gem "activesupport", "~> 7.2.0" diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile index 629ec73..6649c0a 100644 --- a/gemfiles/rails_8.0.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -5,8 +5,6 @@ source "https://rubygems.org" gem "appraisal" gem "rake" gem "rspec", "~> 3.6" -gem "rspec-collection_matchers" -gem "rspec-its" gem "webmock", "~> 3.0" gem "rake-release", "~> 1.0" gem "activesupport", "~> 8.0.0" diff --git a/gemfiles/rails_8.1.gemfile b/gemfiles/rails_8.1.gemfile index aeee44e..569a3dc 100644 --- a/gemfiles/rails_8.1.gemfile +++ b/gemfiles/rails_8.1.gemfile @@ -5,8 +5,6 @@ source "https://rubygems.org" gem "appraisal" gem "rake" gem "rspec", "~> 3.6" -gem "rspec-collection_matchers" -gem "rspec-its" gem "webmock", "~> 3.0" gem "rake-release", "~> 1.0" gem "activesupport", "~> 8.1.0" diff --git a/gemfiles/rails_master.gemfile b/gemfiles/rails_master.gemfile index 80086d2..2d31d9e 100644 --- a/gemfiles/rails_master.gemfile +++ b/gemfiles/rails_master.gemfile @@ -5,8 +5,6 @@ source "https://rubygems.org" gem "appraisal" gem "rake" gem "rspec", "~> 3.6" -gem "rspec-collection_matchers" -gem "rspec-its" gem "webmock", "~> 3.0" gem "rake-release", "~> 1.0" gem "activesupport", github: "rails/rails" diff --git a/spec/acfs/collection_spec.rb b/spec/acfs/collection_spec.rb index 8f51f15..1f76a75 100644 --- a/spec/acfs/collection_spec.rb +++ b/spec/acfs/collection_spec.rb @@ -6,7 +6,7 @@ let(:model) { MyUser } describe 'Pagination' do - subject do + subject(:res) do Acfs.run collection end @@ -24,9 +24,11 @@ },) end - its(:total_pages) { is_expected.to eq 2 } - its(:current_page) { is_expected.to eq 1 } - its(:total_count) { is_expected.to eq 10 } + it 'exposes pagination headers', :aggregate_failures do + expect(res.total_pages).to eq 2 + expect(res.current_page).to eq 1 + expect(res.total_count).to eq 10 + end end context 'with page parameter' do @@ -41,9 +43,11 @@ },) end - its(:total_pages) { is_expected.to eq 2 } - its(:current_page) { is_expected.to eq 2 } - its(:total_count) { is_expected.to eq 10 } + it 'exposes pagination headers', :aggregate_failures do + expect(res.total_pages).to eq 2 + expect(res.current_page).to eq 2 + expect(res.total_count).to eq 10 + end end context 'with non-numerical page parameter' do @@ -58,9 +62,11 @@ },) end - its(:total_pages) { is_expected.to eq 2 } - its(:current_page) { is_expected.to eq 'e546f5' } - its(:total_count) { is_expected.to eq 10 } + it 'exposes pagination headers', :aggregate_failures do + expect(res.total_pages).to eq 2 + expect(res.current_page).to eq 'e546f5' + expect(res.total_count).to eq 10 + end end describe '#next_page' do diff --git a/spec/acfs/global_spec.rb b/spec/acfs/global_spec.rb index ddc04b3..5b38751 100644 --- a/spec/acfs/global_spec.rb +++ b/spec/acfs/global_spec.rb @@ -31,7 +31,7 @@ def events it 'triggers event' do Acfs.run - expect(collector.events).to have(1).items + expect(collector.events.size).to eq(1) end end @@ -42,7 +42,7 @@ def events it 'triggers event' do Acfs.reset - expect(collector.events).to have(1).items + expect(collector.events.size).to eq(1) end end end diff --git a/spec/acfs/operation_spec.rb b/spec/acfs/operation_spec.rb index 3bfd19f..88b0357 100644 --- a/spec/acfs/operation_spec.rb +++ b/spec/acfs/operation_spec.rb @@ -6,8 +6,8 @@ let(:operation) { described_class.new MyUser, :read, params: {id: 0} } describe '#request' do - subject { operation.request } + subject(:op_request) { operation.request } - its(:operation) { is_expected.to eq operation } + it { expect(op_request.operation).to eq operation } end end diff --git a/spec/acfs/request/callbacks_spec.rb b/spec/acfs/request/callbacks_spec.rb index 602bf85..7ab34dd 100644 --- a/spec/acfs/request/callbacks_spec.rb +++ b/spec/acfs/request/callbacks_spec.rb @@ -10,7 +10,7 @@ it 'stores a given callback' do request.on_complete(&callback) - expect(request.callbacks).to have(1).item + expect(request.callbacks.size).to eq(1) expect(request.callbacks[0]).to eq callback end @@ -18,7 +18,7 @@ request.on_complete {|_res| 'abc' } request.on_complete(&callback) - expect(request.callbacks).to have(2).item + expect(request.callbacks.size).to eq(2) expect(request.callbacks[0]).to eq callback end end diff --git a/spec/acfs/resource/locatable_spec.rb b/spec/acfs/resource/locatable_spec.rb index c4a4ec9..bae5370 100644 --- a/spec/acfs/resource/locatable_spec.rb +++ b/spec/acfs/resource/locatable_spec.rb @@ -44,37 +44,31 @@ context ':list location' do let(:action) { :list } - its(:raw_uri) do - is_expected.to eq 'http://users.example.org/users/:user_id/sessions' - end + it { expect(location.raw_uri).to eq 'http://users.example.org/users/:user_id/sessions' } end context ':create location' do let(:action) { :create } - its(:raw_uri) { is_expected.to eq 'http://users.example.org/sessions' } + it { expect(location.raw_uri).to eq 'http://users.example.org/sessions' } end context ':read location' do let(:action) { :read } - its(:raw_uri) { is_expected.to eq 'http://users.example.org/sessions/:id' } + it { expect(location.raw_uri).to eq 'http://users.example.org/sessions/:id' } end context ':update location' do let(:action) { :update } - its(:raw_uri) do - expect { location }.to raise_error ArgumentError, /update.*disabled/ - end + it { expect { location }.to raise_error ArgumentError, /update.*disabled/ } end context ':delete location' do let(:action) { :delete } - its(:raw_uri) do - is_expected.to eq 'http://users.example.org/users/:user_id/sessions/del/:id' - end + it { expect(location.raw_uri).to eq 'http://users.example.org/users/:user_id/sessions/del/:id' } end end end diff --git a/spec/acfs/resource/query_methods_spec.rb b/spec/acfs/resource/query_methods_spec.rb index d2ce3fd..85ac322 100644 --- a/spec/acfs/resource/query_methods_spec.rb +++ b/spec/acfs/resource/query_methods_spec.rb @@ -197,7 +197,7 @@ Acfs.run expect(computers).to be_loaded - expect(computers).to have(3).items + expect(computers.size).to eq(3) expect(computers[0]).to be_a PC expect(computers[1]).to be_a Computer expect(computers[2]).to be_a Mac diff --git a/spec/acfs/resource/validation_spec.rb b/spec/acfs/resource/validation_spec.rb index 28b7a10..051be59 100644 --- a/spec/acfs/resource/validation_spec.rb +++ b/spec/acfs/resource/validation_spec.rb @@ -61,10 +61,9 @@ before { model.valid? } - it { is_expected.not_to be_empty } - it { is_expected.to have(2).items } - - it 'contains a list of error messages' do + it 'contains expected errors', :aggregate_failures do + expect(errors).not_to be_empty + expect(errors.size).to eq(2) expect(errors.to_hash).to eq age: ["can't be blank"], name: ['is invalid'] end end diff --git a/spec/acfs/runner_spec.rb b/spec/acfs/runner_spec.rb index 351c622..a5eb904 100644 --- a/spec/acfs/runner_spec.rb +++ b/spec/acfs/runner_spec.rb @@ -50,24 +50,24 @@ def events describe '#process' do it 'triggers event' do runner.process Acfs::Operation.new MyUser, :read, params: {id: 0} - expect(collector.events).to have(1).items - expect(collector2.events).to have(1).items + expect(collector.events.size).to eq(1) + expect(collector2.events.size).to eq(1) end end describe '#run' do it 'triggers event' do runner.run Acfs::Operation.new MyUser, :read, params: {id: 0} - expect(collector.events).to have(1).items - expect(collector2.events).to have(0).items + expect(collector.events.size).to eq(1) + expect(collector2.events.size).to eq(0) end end describe '#enqueue' do it 'triggers event' do runner.enqueue Acfs::Operation.new MyUser, :read, params: {id: 0} - expect(collector.events).to have(1).items - expect(collector2.events).to have(0).items + expect(collector.events.size).to eq(1) + expect(collector2.events.size).to eq(0) end end end diff --git a/spec/acfs/stub_spec.rb b/spec/acfs/stub_spec.rb index fbdad3f..94a5ddd 100644 --- a/spec/acfs/stub_spec.rb +++ b/spec/acfs/stub_spec.rb @@ -140,7 +140,7 @@ class SpecialCustomError < StandardError; end users = MyUser.all Acfs.run - expect(users).to have(2).items + expect(users.size).to eq(2) end it 'returns defined resources' do @@ -169,7 +169,7 @@ class SpecialCustomError < StandardError; end end context 'with header' do - subject do + subject(:comments_result) do Acfs.run comments end @@ -188,8 +188,10 @@ class SpecialCustomError < StandardError; end } end - its(:total_pages) { is_expected.to eq 2 } - its(:total_count) { is_expected.to eq 10 } + it 'exposes pagination headers', :aggregate_failures do + expect(comments_result.total_pages).to eq 2 + expect(comments_result.total_count).to eq 10 + end end end diff --git a/spec/acfs_spec.rb b/spec/acfs_spec.rb index 82b9c5a..cc867f5 100644 --- a/spec/acfs_spec.rb +++ b/spec/acfs_spec.rb @@ -155,7 +155,7 @@ Acfs.run expect(users).to be_loaded - expect(users).to have(3).items + expect(users.size).to eq(3) expect(users[0].id).to eq 2 expect(users[0].name).to eq 'John' @@ -181,7 +181,7 @@ Acfs.run expect(users).to be_loaded - expect(users).to have(2).items + expect(users.size).to eq(2) expect(users[0].name).to eq 'Anon' expect(users[0].age).to eq 12 expect(users[1].name).to eq 'John' @@ -201,7 +201,7 @@ expect(user.name).to eq 'John' expect(user.age).to eq 26 - expect(friends).to have(1).items + expect(friends.size).to eq(1) end it 'loads associated resources from different service' do @@ -218,6 +218,6 @@ expect(user.name).to eq 'John' expect(user.age).to eq 26 - expect(comments).to have(2).items + expect(comments.size).to eq(2) end end