acfs 1.6.0 → 1.7.0

data/spec/acfs/resource/validation_spec.rb

@@ -10,61 +10,70 @@ describe Acfs::Resource::Validation do
     context 'with valid attributes' do
       subject { model }
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
 
     context 'with invalid attributes' do
-      let(:params) { {name: 'invname'} }
       subject { model }
 
-      it { should_not be_valid }
+      let(:params) { {name: 'invname'} }
+
+      it { is_expected.not_to be_valid }
     end
 
     context 'on resource with service side errors' do
+      subject(:resource) { MyUser.create(params) }
+
       before { Acfs::Stub.enable }
+
       after  { Acfs::Stub.disable }
 
       before do
         Acfs::Stub.resource MyUser, :create, return: {errors: {name: ['can\'t be blank']}}, raise: 422
       end
 
-      let(:params)   { {} }
-      let(:resource) { MyUser.create params }
-      subject { resource }
+      let(:params) { {} }
 
-      it { should_not be_valid }
+      it { is_expected.not_to be_valid }
 
-      it 'should not override errors' do
-        subject.valid?
-        expect(subject.errors.to_hash).to eq(name: ['can\'t be blank'])
+      it 'does not override errors' do
+        resource.valid?
+        expect(resource.errors.to_hash).to eq(name: ['can\'t be blank'])
       end
     end
   end
 
   describe '#errors' do
     context 'with valid attributes' do
+      subject { model.errors }
+
       let(:params) { {name: 'john smith', age: 24} }
+
       before { model.valid? }
-      subject { model.errors }
 
-      it { should be_empty }
+      it { is_expected.to be_empty }
     end
 
     context 'with invalid attributes' do
+      subject(:errors) { model.errors }
+
       let(:params) { {name: 'john'} }
+
       before { model.valid? }
-      subject { model.errors }
 
-      it { should_not be_empty }
-      it { should have(2).items }
+      it { is_expected.not_to be_empty }
+      it { is_expected.to have(2).items }
 
-      it 'should contain a list of error messages' do
-        expect(subject.to_hash).to eq age: ["can't be blank"], name: ['is invalid']
+      it 'contains a list of error messages' do
+        expect(errors.to_hash).to eq age: ["can't be blank"], name: ['is invalid']
       end
     end
 
     context 'server side errors' do
+      subject { resource.errors.to_hash }
+
       before { Acfs::Stub.enable }
+
       after  { Acfs::Stub.disable }
 
       before do
@@ -74,7 +83,6 @@ describe Acfs::Resource::Validation do
 
       let(:params)   { {} }
       let(:resource) { MyUser.create params }
-      subject { resource.errors.to_hash }
 
       context 'with `field => [messages]` payload' do
         let(:errors) { {name: ['cannot be blank']} }
@@ -97,33 +105,32 @@ describe Acfs::Resource::Validation do
   end
 
   describe '#save!' do
-    subject { -> { model.save! } }
+    subject(:save) { -> { model.save! } }
+
     before { allow(model).to receive(:operation) }
 
     context 'with invalid attributes' do
       let(:params) { {name: 'john'} }
 
-      it { expect { subject.call }.to raise_error Acfs::InvalidResource }
+      it { expect { save.call }.to raise_error Acfs::InvalidResource }
     end
 
     context 'on new resource' do
-      it 'should validate with `create` context' do
+      it 'validates with `create` context' do
         expect(model).to receive(:valid?).with(:create).and_call_original
-        subject.call
+        save.call
       end
     end
 
     context 'on changed resource' do
       before { model.loaded! }
+
       let(:model) { super().tap {|m| m.id = 1 } }
 
-      it 'should validate with `save` context' do
+      it 'validates with `save` context' do
         expect(model).to receive(:valid?).with(:save).and_call_original
-        subject.call
+        save.call
       end
     end
   end
-
-  describe 'validates with context' do
-  end
 end

data/spec/acfs/response/formats_spec.rb

@@ -13,8 +13,8 @@ describe Acfs::Response::Formats do
   context 'without Content-Type header' do
     let(:headers) { {} }
 
-    it "should fallback on 'text/plain'" do
-      expect(response.content_type).to be == Mime[:text]
+    it "fallbacks on 'text/plain'" do
+      expect(response.content_type).to eq Mime[:text]
     end
   end
 
@@ -22,13 +22,13 @@ describe Acfs::Response::Formats do
     let(:mime_type) { 'application/json' }
 
     describe '#content_type' do
-      it 'should return Mime::JSON' do
-        expect(response.content_type).to be == Mime[:json]
+      it 'returns Mime::JSON' do
+        expect(response.content_type).to eq Mime[:json]
       end
     end
 
     describe '#json?' do
-      it 'should return true' do
+      it 'returns true' do
         expect(response).to be_json
       end
     end
@@ -37,13 +37,13 @@ describe Acfs::Response::Formats do
       let(:mime_type) { 'application/json; charset=utf8' }
 
       describe '#content_type' do
-        it 'should return Mime::JSON' do
-          expect(response.content_type).to be == Mime[:json]
+        it 'returns Mime::JSON' do
+          expect(response.content_type).to eq Mime[:json]
         end
       end
 
       describe '#json?' do
-        it 'should return true' do
+        it 'returns true' do
           expect(response).to be_json
         end
       end

data/spec/acfs/response/status_spec.rb

@@ -14,18 +14,18 @@ describe Acfs::Response::Status do
     context 'when given' do
       let(:status) { 200 }
 
-      it 'should return status code' do
-        expect(response.code).to be == 200
-        expect(response.status_code).to be == 200
+      it 'returns status code' do
+        expect(response.code).to eq 200
+        expect(response.status_code).to eq 200
       end
     end
 
     context 'when nil' do
       let(:status) { nil }
 
-      it 'should return zero' do
-        expect(response.code).to be == 0
-        expect(response.status_code).to be == 0
+      it 'returns zero' do
+        expect(response.code).to eq 0
+        expect(response.status_code).to eq 0
       end
     end
   end
@@ -33,38 +33,45 @@ describe Acfs::Response::Status do
   describe '#success?' do
     context 'with success status code' do
       let(:status) { 200 }
+
       it { expect(response).to be_success }
     end
 
     context 'with error status code' do
       let(:status) { 500 }
-      it { expect(response).to_not be_success }
+
+      it { expect(response).not_to be_success }
     end
 
     context 'with zero status code' do
       let(:status) { nil }
-      it { expect(response).to_not be_success }
+
+      it { expect(response).not_to be_success }
     end
   end
 
   describe '#modified?' do
     context 'with success status code' do
       let(:status) { 200 }
+
       it { expect(response).to be_modified }
     end
 
     context 'with not modified status code' do
       let(:status) { 304 }
-      it { expect(response).to_not be_modified }
+
+      it { expect(response).not_to be_modified }
     end
 
     context 'with error status code' do
       let(:status) { 500 }
+
       it { expect(response).to be_modified }
     end
 
     context 'with zero status code' do
       let(:status) { nil }
+
       it { expect(response).to be_modified }
     end
   end

data/spec/acfs/runner_spec.rb

@@ -48,7 +48,7 @@ describe ::Acfs::Runner do
     end
 
     describe '#process' do
-      it 'should trigger event' 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
@@ -56,7 +56,7 @@ describe ::Acfs::Runner do
     end
 
     describe '#run' do
-      it 'should trigger event' 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
@@ -64,7 +64,7 @@ describe ::Acfs::Runner do
     end
 
     describe '#enqueue' do
-      it 'should trigger event' 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
@@ -76,18 +76,20 @@ describe ::Acfs::Runner do
     before do
       expect_any_instance_of(UserService).to receive(:prepare).and_return nil
     end
-    it 'it should not do requests when a middleware aborted' do
-      expect(adapter).to_not receive :run
+
+    it 'does not do requests when a middleware aborted' do
+      expect(adapter).not_to receive :run
       runner.run ::Acfs::Operation.new MyUser, :read, params: {id: 0}
     end
   end
 
   describe '#enqueue' do
     before do
-      expect_any_instance_of(UserService).to receive(:prepare).and_return nil
+      expect_any_instance_of(UserService).to receive(:prepare).and_return(nil)
     end
-    it 'it should not do requests when a middleware aborted' do
-      expect(adapter).to_not receive :queue
+
+    it 'does not do requests when a middleware aborted' do
+      expect(adapter).not_to receive(:queue)
       runner.enqueue ::Acfs::Operation.new MyUser, :read, params: {id: 0}
       runner.start
     end

data/spec/acfs/service/middleware_spec.rb

@@ -13,19 +13,19 @@ describe Acfs::Service::Middleware do
   describe '.use' do
     let(:options) { {abc: 'cde'} }
 
-    it 'should add middleware to list' do
+    it 'adds middleware to list' do
       srv_class.use middleware
 
       expect(srv_class.middleware).to include(middleware)
     end
 
-    it 'should add middleware to stack' do
+    it 'adds middleware to stack' do
       srv_class.use middleware
 
       expect(srv_class.middleware.build(1)).to be_a(middleware)
     end
 
-    it 'should instantiate middleware object' do
+    it 'instantiates middleware object' do
       expect(middleware).to receive(:new).with(anything, options)
 
       srv_class.use middleware, options

data/spec/acfs/service_spec.rb

@@ -14,23 +14,24 @@ describe Acfs::Service do
   describe '#initialize' do
     let(:options) { {path: 'abc', key: 'value'} }
 
-    it 'should set options' do
+    it 'sets options' do
       expect(service.options).to eq(options)
     end
   end
 
   describe '#location' do
     let(:resource) { Class.new }
+
     before { allow(resource).to receive(:location_default_path, &proc {|_a, p| p }) }
 
-    it 'should extract resource path name from given class' do
+    it 'extracts resource path name from given class' do
       expect(service.location(resource).to_s).to eq('/classes')
     end
 
     context 'with path options' do
       let(:options) { {path: 'abc'} }
 
-      it 'should have custom resource path' do
+      it 'has custom resource path' do
         expect(service.location(resource).to_s).to eq('/abc')
       end
     end
@@ -41,7 +42,7 @@ describe Acfs::Service do
       Acfs::Configuration.current.locate :test, 'http://abc.de/api/v1'
     end
 
-    it 'should return configured URI for service' do
+    it 'returns configured URI for service' do
       expect(srv_class.base_url).to eq('http://abc.de/api/v1')
     end
   end

data/spec/acfs/singleton_resource_spec.rb

@@ -12,6 +12,7 @@ describe Acfs::SingletonResource do
     end
 
     let(:action) { ->(cb) { model.find(&cb) } }
-    it_should_behave_like 'a query method with multi-callback support'
+
+    it_behaves_like 'a query method with multi-callback support'
   end
 end

data/spec/acfs/stub_spec.rb

@@ -7,8 +7,9 @@ class SpecialCustomError < StandardError; end
 describe Acfs::Stub do
   let(:stub) { Class.new(Acfs::Stub) }
 
-  before(:all) { Acfs::Stub.enable }
-  after(:all) { Acfs::Stub.disable }
+  before(:all) { Acfs::Stub.enable } # rubocop:disable RSpec/BeforeAfterAll
+
+  after(:all) { Acfs::Stub.disable } # rubocop:disable RSpec/BeforeAfterAll
 
   before do
     Acfs::Stub.allow_requests = false
@@ -16,16 +17,18 @@ describe Acfs::Stub do
 
   describe '#called?' do
     context 'without specified number' do
-      let!(:operation) { Acfs::Stub.resource MyUser, :read, with: {id: 1}, return: {id: 1, name: 'John Smith', age: 32} }
+      let!(:operation) do
+        Acfs::Stub.resource MyUser, :read, with: {id: 1}, return: {id: 1, name: 'John Smith', age: 32}
+      end
 
-      it 'should allow to test if stub was called' do
+      it 'allows to test if stub was called' do
         MyUser.find 1
         Acfs.run
 
         expect(operation).to be_called
       end
 
-      it 'should allow to test if stub was called a specific number of times' do
+      it 'allows to test if stub was called a specific number of times' do
         MyUser.find 1
         Acfs.run
 
@@ -44,7 +47,7 @@ describe Acfs::Stub do
         Acfs::Stub.resource MyUser, :read, with: {id: 1}, raise: :not_found
       end
 
-      it 'should raise error' do
+      it 'raises error' do
         MyUser.find 1
 
         expect { Acfs.run }.to raise_error(Acfs::AmbiguousStubError)
@@ -58,23 +61,23 @@ describe Acfs::Stub do
         Acfs::Stub.resource MyUser, :read, with: {id: 3}, raise: :not_found
       end
 
-      it 'should allow to stub resource reads' do
+      it 'allows to stub resource reads' do
         user = MyUser.find 1
         Acfs.run
 
-        expect(user.id).to be == 1
-        expect(user.name).to be == 'John Smith'
-        expect(user.age).to be == 32
+        expect(user.id).to eq 1
+        expect(user.name).to eq 'John Smith'
+        expect(user.age).to eq 32
       end
 
       context 'with error' do
-        it 'should allow to raise errors' do
+        it 'allows to raise errors' do
           MyUser.find 2
 
           expect { Acfs.run }.to raise_error(SpecialCustomError)
         end
 
-        it 'should allow to raise symbolic errors' do
+        it 'allows to raise symbolic errors' do
           MyUser.find 3
 
           expect { Acfs.run }.to raise_error(Acfs::ResourceNotFound)
@@ -87,7 +90,7 @@ describe Acfs::Stub do
           Acfs::Stub.resource Computer, :read, with: {id: 2}, return: {id: 2, type: 'Mac'}
         end
 
-        it 'should create inherited type' do
+        it 'creates inherited type' do
           pc = Computer.find 1
           mac = Computer.find 2
 
@@ -101,18 +104,26 @@ describe Acfs::Stub do
 
     context 'with create action' do
       before do
-        Acfs::Stub.resource Session, :create, with: {ident: 'john@exmaple.org', password: 's3cr3t'}, return: {id: 'longhash', user: 1}
-        Acfs::Stub.resource Session, :create, with: ->(op) { op.data[:ident] == 'john@exmaple.org' && op.data[:password] == 'wrong' }, raise: 422
+        lmbd = lambda {|op|
+          op.data[:ident] == 'john@exmaple.org' && op.data[:password] == 'wrong'
+        }
+
+        Acfs::Stub.resource Session, :create,
+          with: {ident: 'john@exmaple.org', password: 's3cr3t'},
+          return: {id: 'longhash', user: 1}
+        Acfs::Stub.resource Session, :create,
+          with: lmbd,
+          raise: 422
       end
 
-      it 'should allow stub resource creation' do
+      it 'allows stub resource creation' do
         session = Session.create! ident: 'john@exmaple.org', password: 's3cr3t'
 
-        expect(session.id).to be == 'longhash'
-        expect(session.user).to be == 1
+        expect(session.id).to eq 'longhash'
+        expect(session.user).to eq 1
       end
 
-      it 'should allow to raise error' do
+      it 'allows to raise error' do
         expect do
           Session.create! ident: 'john@exmaple.org', password: 'wrong'
         end.to raise_error(::Acfs::InvalidResource)
@@ -125,14 +136,14 @@ describe Acfs::Stub do
           return: [{id: 1, name: 'John Smith', age: 32}, {id: 2, name: 'Anon', age: 12}]
       end
 
-      it 'should return collection' do
+      it 'returns collection' do
         users = MyUser.all
         Acfs.run
 
         expect(users).to have(2).items
       end
 
-      it 'should return defined resources' do
+      it 'returns defined resources' do
         users = MyUser.all
         Acfs.run
 
@@ -148,7 +159,7 @@ describe Acfs::Stub do
             return: [{id: 1, type: 'PC'}, {id: 2, type: 'Mac'}]
         end
 
-        it 'should create inherited type' do
+        it 'creates inherited type' do
           computers = Computer.all
           Acfs.run
 
@@ -158,6 +169,11 @@ describe Acfs::Stub do
       end
 
       context 'with header' do
+        subject do
+          Acfs.run
+          comments
+        end
+
         before do
           Acfs::Stub.resource Comment, :list,
             return: [{id: 1, text: 'Foo'}, {id: 2, text: 'Bar'}],
@@ -168,40 +184,40 @@ describe Acfs::Stub do
         let(:headers) do
           {
             'X-Total-Pages' => '2',
-            'X-Total-Count' => '10'
+            'X-Total-Count' => '10',
           }
         end
-        subject { Acfs.run; comments }
 
-        its(:total_pages) { should eq 2 }
-        its(:total_count) { should eq 10 }
+        its(:total_pages) { is_expected.to eq 2 }
+        its(:total_count) { is_expected.to eq 10 }
       end
     end
 
     context 'with update action' do
       before do
         Acfs::Stub.resource MyUser, :read, with: {id: 1}, return: {id: 1, name: 'John Smith', age: 32}
-        Acfs::Stub.resource MyUser, :update, with: {id: 1, name: 'John Smith', age: 22}, return: {id: 1, name: 'John Smith', age: 23}
+        Acfs::Stub.resource MyUser, :update, with: {id: 1, name: 'John Smith', age: 22},
+          return: {id: 1, name: 'John Smith', age: 23}
         Acfs::Stub.resource MyUser, :update, with: {id: 1, name: 'John Smith', age: 0}, raise: 422
       end
 
       let!(:update_stub) do
         Acfs::Stub.resource MyUser, :update,
           with: {id: 1, name: 'Jane Smith'},
-          return: ->(op) { Hash[op.data.map {|k, v| [k, v.to_s.upcase] }] }
+          return: ->(op) { op.data.map {|k, v| [k, v.to_s.upcase] }.to_h }
       end
 
-      it 'should allow stub resource update' do
+      it 'allows stub resource update' do
         user = MyUser.find 1
         Acfs.run
 
         user.age = 22
         user.save!
 
-        expect(user.age).to be == 23
+        expect(user.age).to eq 23
       end
 
-      it 'should allow to raise error' do
+      it 'allows to raise error' do
         user = MyUser.find 1
         Acfs.run
 
@@ -213,7 +229,7 @@ describe Acfs::Stub do
         end.to raise_error(::Acfs::InvalidResource)
       end
 
-      it 'should match partial :with' do
+      it 'matches partial :with' do
         user = MyUser.find 1
         Acfs.run
 
@@ -224,7 +240,7 @@ describe Acfs::Stub do
         expect(update_stub).to be_called
       end
 
-      it 'should process response body' do
+      it 'processes response body' do
         user = MyUser.find 1
         Acfs.run
 
@@ -235,18 +251,6 @@ describe Acfs::Stub do
         expect(user.name).to eq 'JANE SMITH'
       end
     end
-
-    context 'with create action' do
-      before do
-        Acfs::Stub.resource MyUser, :create, with: {name: 'John Smith', age: 0}, raise: 422
-      end
-
-      it 'should allow to raise error' do
-        expect do
-          MyUser.create! name: 'John Smith', age: 0
-        end.to raise_error(::Acfs::InvalidResource)
-      end
-    end
   end
 
   describe '.allow_requests=' do
@@ -256,9 +260,9 @@ describe Acfs::Stub do
         stub_request(:get, 'http://users.example.org/users/2').to_return response(id: 2, name: 'John', age: 26)
       end
 
-      it 'should allow real requests' do
+      it 'allows real requests' do
         @user = MyUser.find 2
-        expect { Acfs.run }.to_not raise_error
+        expect { Acfs.run }.not_to raise_error
       end
     end
 
@@ -267,7 +271,7 @@ describe Acfs::Stub do
         Acfs::Stub.allow_requests = false
       end
 
-      it 'should not allow real requests' do
+      it 'does not allow real requests' do
         @user = MyUser.find 2
         expect { Acfs.run }.to raise_error(Acfs::RealRequestsNotAllowedError)
       end
@@ -279,7 +283,7 @@ describe Acfs::Stub do
 
     context 'with a match in params' do
       let(:op) do
-        double('operation').tap do |op|
+        instance_double('Acfs::Operation').tap do |op|
           allow(op).to receive(:full_params).and_return(id: 1337, blub: 'abc')
           allow(op).to receive(:data).and_return({})
         end
@@ -292,7 +296,7 @@ describe Acfs::Stub do
 
     context 'with a match in data' do
       let(:op) do
-        double('operation').tap do |op|
+        instance_double('Acfs::Operation').tap do |op|
           allow(op).to receive(:full_params).and_return({})
           allow(op).to receive(:data).and_return(id: 1337, blub: 'abc')
         end
@@ -305,7 +309,7 @@ describe Acfs::Stub do
 
     context 'with no match in params nor data' do
       let(:op) do
-        double('operation').tap do |op|
+        instance_double('Acfs::Operation').tap do |op|
           allow(op).to receive(:full_params).and_return(id: 1337)
           allow(op).to receive(:data).and_return({})
         end
@@ -318,7 +322,7 @@ describe Acfs::Stub do
 
     context 'with a wrong match' do
       let(:op) do
-        double('operation').tap do |op|
+        instance_double('Acfs::Operation').tap do |op|
           allow(op).to receive(:full_params).and_return(id: 1337, blub: 'abc')
           allow(op).to receive(:data).and_return({})
         end
@@ -331,7 +335,7 @@ describe Acfs::Stub do
 
     context 'with a missing match' do
       let(:op) do
-        double('operation').tap do |op|
+        instance_double('Acfs::Operation').tap do |op|
           allow(op).to receive(:full_params).and_return(id: 1337, blub: 'abc')
           allow(op).to receive(:data).and_return({})
         end