grape 1.6.2 → 1.7.1

data/spec/grape/exceptions/base_spec.rb

@@ -1,8 +1,22 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::Base do
+  describe '#to_s' do
+    subject { described_class.new(message: message).to_s }
+
+    let(:message) { 'a_message' }
+
+    it { is_expected.to eq(message) }
+  end
+
+  describe '#message' do
+    subject { described_class.new(message: message).message }
+
+    let(:message) { 'a_message' }
+
+    it { is_expected.to eq(message) }
+  end
+
   describe '#compose_message' do
     subject { described_class.new.send(:compose_message, key, **attributes) }
 

data/spec/grape/exceptions/body_parse_errors_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::ValidationErrors do
   context 'api with rescue_from :all handler' do
     subject { Class.new(Grape::API) }

data/spec/grape/exceptions/invalid_accept_header_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::InvalidAcceptHeader do
   shared_examples_for 'a valid request' do
     it 'does return with status 200' do
@@ -12,11 +10,13 @@ describe Grape::Exceptions::InvalidAcceptHeader do
       expect(last_response.body).to eq('beer received')
     end
   end
+
   shared_examples_for 'a cascaded request' do
     it 'does not find a matching route' do
       expect(last_response.status).to eq 404
     end
   end
+
   shared_examples_for 'a not-cascaded request' do
     it 'does not include the X-Cascade=pass header' do
       expect(last_response.headers['X-Cascade']).to be_nil
@@ -26,6 +26,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
       expect(last_response.status).to eq 406
     end
   end
+
   shared_examples_for 'a rescued request' do
     it 'does not include the X-Cascade=pass header' do
       expect(last_response.headers['X-Cascade']).to be_nil

data/spec/grape/exceptions/invalid_formatter_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::InvalidFormatter do
   describe '#message' do
     let(:error) do

data/spec/grape/exceptions/invalid_response_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::InvalidResponse do
   describe '#message' do
     let(:error) { described_class.new }

data/spec/grape/exceptions/invalid_versioner_option_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::InvalidVersionerOption do
   describe '#message' do
     let(:error) do
@@ -10,7 +8,7 @@ describe Grape::Exceptions::InvalidVersionerOption do
 
     it 'contains the problem in the message' do
       expect(error.message).to include(
-        'Unknown :using for versioner: headers'
+        'unknown :using for versioner: headers'
       )
     end
   end

data/spec/grape/exceptions/missing_group_type_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+RSpec.describe Grape::Exceptions::MissingGroupType do
+  describe '#message' do
+    subject { described_class.new.message }
+
+    it { is_expected.to include 'group type is required' }
+  end
+
+  describe 'deprecated Grape::Exceptions::MissingGroupTypeError' do
+    subject { Grape::Exceptions::MissingGroupTypeError.new }
+
+    it 'puts a deprecation warning' do
+      expect(Warning).to receive(:warn) do |message|
+        expect(message).to include('`Grape::Exceptions::MissingGroupTypeError` is deprecated')
+      end
+
+      subject
+    end
+  end
+end

data/spec/grape/exceptions/missing_mime_type_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::MissingMimeType do
   describe '#message' do
     let(:error) do

data/spec/grape/exceptions/missing_option_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::MissingOption do
   describe '#message' do
     let(:error) do
@@ -10,7 +8,7 @@ describe Grape::Exceptions::MissingOption do
 
     it 'contains the problem in the message' do
       expect(error.message).to include(
-        'You must specify :path options.'
+        'you must specify :path options'
       )
     end
   end

data/spec/grape/exceptions/unknown_options_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::UnknownOptions do
   describe '#message' do
     let(:error) do

data/spec/grape/exceptions/unknown_validator_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::UnknownValidator do
   describe '#message' do
     let(:error) do

data/spec/grape/exceptions/unsupported_group_type_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+RSpec.describe Grape::Exceptions::UnsupportedGroupType do
+  subject { described_class.new }
+
+  describe '#message' do
+    subject { described_class.new.message }
+
+    it { is_expected.to include 'group type must be Array, Hash, JSON or Array[JSON]' }
+  end
+
+  describe 'deprecated Grape::Exceptions::UnsupportedGroupTypeError' do
+    subject { Grape::Exceptions::UnsupportedGroupTypeError.new }
+
+    it 'puts a deprecation warning' do
+      expect(Warning).to receive(:warn) do |message|
+        expect(message).to include('`Grape::Exceptions::UnsupportedGroupTypeError` is deprecated')
+      end
+
+      subject
+    end
+  end
+end

data/spec/grape/exceptions/validation_errors_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
 require 'ostruct'
 
 describe Grape::Exceptions::ValidationErrors do

data/spec/grape/exceptions/validation_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Exceptions::Validation do
   it 'fails when params are missing' do
     expect { described_class.new(message: 'presence') }.to raise_error(ArgumentError, /missing keyword:.+?params/)
@@ -15,7 +13,7 @@ describe Grape::Exceptions::Validation do
 
   context 'when message is a String' do
     it 'does not store the message_key' do
-      expect(described_class.new(params: ['id'], message: 'presence').message_key).to eq(nil)
+      expect(described_class.new(params: ['id'], message: 'presence').message_key).to be_nil
     end
   end
 end

data/spec/grape/extensions/param_builders/hash_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Extensions::Hash::ParamBuilder do
   subject { Class.new(Grape::API) }
 

data/spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Extensions::ActiveSupport::HashWithIndifferentAccess::ParamBuilder do
   subject { Class.new(Grape::API) }
 

data/spec/grape/extensions/param_builders/hashie/mash_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Extensions::Hashie::Mash::ParamBuilder do
   subject { Class.new(Grape::API) }
 

data/spec/grape/integration/global_namespace_function_spec.rb

@@ -2,8 +2,6 @@
 
 # see https://github.com/ruby-grape/grape/issues/1348
 
-require 'spec_helper'
-
 def namespace
   raise
 end

data/spec/grape/integration/rack_sendfile_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Rack::Sendfile do
   subject do
     content_object = file_object

data/spec/grape/integration/rack_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Rack do
   it 'correctly populates params from a Tempfile' do
     input = Tempfile.new 'rubbish'
@@ -29,19 +27,20 @@ describe Rack do
   end
 
   context 'when the app is mounted' do
-    def app
-      @main_app ||= Class.new(Grape::API) do
+    let(:ping_mount) do
+      Class.new(Grape::API) do
         get 'ping'
       end
     end
 
-    let!(:base) do
-      app_to_mount = app
-      Class.new(Grape::API) do
+    let(:app) do
+      app_to_mount = ping_mount
+      app = Class.new(Grape::API) do
         namespace 'namespace' do
           mount app_to_mount
         end
       end
+      Rack::Builder.new(app)
     end
 
     it 'finds the app on the namespace' do

data/spec/grape/loading_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::API do
   subject do
     CombinedApi = combined_api

data/spec/grape/middleware/auth/base_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
 require 'base64'
 
 describe Grape::Middleware::Auth::Base do

data/spec/grape/middleware/auth/dsl_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Auth::DSL do
   subject { Class.new(Grape::API) }
 

data/spec/grape/middleware/auth/strategies_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 require 'base64'
 
 describe Grape::Middleware::Auth::Strategies do

data/spec/grape/middleware/base_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Base do
   subject { described_class.new(blank_app) }
 
@@ -72,18 +70,18 @@ describe Grape::Middleware::Base do
 
   it 'is able to access the response' do
     subject.call({})
-    expect(subject.response).to be_kind_of(Rack::Response)
+    expect(subject.response).to be_a(Rack::Response)
   end
 
   describe '#response' do
     subject do
-      puts described_class
       described_class.new(response)
     end
 
     before { subject.call({}) }
 
     context 'when Array' do
+      let(:rack_response) { Rack::Response.new('test', 204, abc: 1) }
       let(:response) { ->(_) { [204, { abc: 1 }, 'test'] } }
 
       it 'status' do
@@ -99,12 +97,14 @@ describe Grape::Middleware::Base do
       end
 
       it 'returns the memoized Rack::Response instance' do
-        expect(subject.response).to be(subject.response)
+        allow(Rack::Response).to receive(:new).and_return(rack_response)
+        expect(subject.response).to eq(rack_response)
       end
     end
 
     context 'when Rack::Response' do
-      let(:response) { ->(_) { Rack::Response.new('test', 204, abc: 1) } }
+      let(:rack_response) { Rack::Response.new('test', 204, abc: 1) }
+      let(:response) { ->(_) { rack_response } }
 
       it 'status' do
         expect(subject.response.status).to eq(204)
@@ -119,7 +119,7 @@ describe Grape::Middleware::Base do
       end
 
       it 'returns the memoized Rack::Response instance' do
-        expect(subject.response).to be(subject.response)
+        expect(subject.response).to eq(rack_response)
       end
     end
   end

data/spec/grape/middleware/error_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
 require 'grape-entity'
 
 describe Grape::Middleware::Error do
@@ -42,6 +41,12 @@ describe Grape::Middleware::Error do
     expect(last_response.status).to eq(410)
   end
 
+  it 'sets the status code based on the rack util status code symbol' do
+    ErrorSpec::ErrApp.error = { status: :gone }
+    get '/'
+    expect(last_response.status).to eq(410)
+  end
+
   it 'sets the error message appropriately' do
     ErrorSpec::ErrApp.error = { message: 'Awesome stuff.' }
     get '/'

data/spec/grape/middleware/exception_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Error do
   let(:exception_app) do
     Class.new do

data/spec/grape/middleware/formatter_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Formatter do
   subject { described_class.new(app) }
 
@@ -15,7 +13,7 @@ describe Grape::Middleware::Formatter do
 
     it 'looks at the bodies for possibly serializable data' do
       _, _, bodies = *subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json')
-      bodies.each { |b| expect(b).to eq(::Grape::Json.dump(body)) }
+      bodies.each { |b| expect(b).to eq(::Grape::Json.dump(body)) } # rubocop:disable RSpec/IteratedExpectation
     end
 
     context 'default format' do
@@ -28,7 +26,7 @@ describe Grape::Middleware::Formatter do
           end
         end
 
-        subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json').to_a.last.each { |b| expect(b).to eq('"bar"') }
+        subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json').to_a.last.each { |b| expect(b).to eq('"bar"') } # rubocop:disable RSpec/IteratedExpectation
       end
     end
 
@@ -42,7 +40,7 @@ describe Grape::Middleware::Formatter do
           end
         end
 
-        subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/vnd.api+json').to_a.last.each { |b| expect(b).to eq('{"foos":[{"bar":"baz"}] }') }
+        subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/vnd.api+json').to_a.last.each { |b| expect(b).to eq('{"foos":[{"bar":"baz"}] }') } # rubocop:disable RSpec/IteratedExpectation
       end
     end
 
@@ -55,8 +53,7 @@ describe Grape::Middleware::Formatter do
             '<bar/>'
           end
         end
-
-        subject.call('PATH_INFO' => '/somewhere.xml', 'HTTP_ACCEPT' => 'application/json').to_a.last.each { |b| expect(b).to eq('<bar/>') }
+        subject.call('PATH_INFO' => '/somewhere.xml', 'HTTP_ACCEPT' => 'application/json').to_a.last.each { |b| expect(b).to eq('<bar/>') } # rubocop:disable RSpec/IteratedExpectation
       end
     end
   end
@@ -245,6 +242,7 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'input' do
+    content_types = ['application/json', 'application/json; charset=utf-8'].freeze
     %w[POST PATCH PUT DELETE].each do |method|
       context 'when body is not nil or empty' do
         context 'when Content-Type is supported' do
@@ -322,7 +320,7 @@ describe Grape::Middleware::Formatter do
         end
       end
 
-      ['application/json', 'application/json; charset=utf-8'].each do |content_type|
+      content_types.each do |content_type|
         context content_type do
           it "parses the body from #{method} and copies values into rack.request.form_hash" do
             io = StringIO.new('{"is_boolean":true,"string":"thing"}')

data/spec/grape/middleware/globals_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Globals do
   subject { described_class.new(blank_app) }
 

data/spec/grape/middleware/stack_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Stack do
   module StackSpec
     class FooMiddleware; end

data/spec/grape/middleware/versioner/accept_version_header_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Versioner::AcceptVersionHeader do
   subject { described_class.new(app, **(@options || {})) }
 

data/spec/grape/middleware/versioner/header_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Versioner::Header do
   subject { described_class.new(app, **(@options || {})) }
 
@@ -48,7 +46,7 @@ describe Grape::Middleware::Versioner::Header do
 
     it 'is nil if not provided' do
       status, _, env = subject.call('HTTP_ACCEPT' => 'application/vnd.vendor')
-      expect(env['api.format']).to be nil
+      expect(env['api.format']).to be_nil
       expect(status).to eq(200)
     end
 
@@ -66,7 +64,7 @@ describe Grape::Middleware::Versioner::Header do
 
         it 'is nil if not provided' do
           status, _, env = subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1')
-          expect(env['api.format']).to be nil
+          expect(env['api.format']).to be_nil
           expect(status).to eq(200)
         end
       end
@@ -328,4 +326,20 @@ describe Grape::Middleware::Versioner::Header do
       end
     end
   end
+
+  context 'with missing vendor option' do
+    subject do
+      Class.new(Grape::API) do
+        version 'v1', using: :header
+      end
+    end
+
+    def app
+      subject
+    end
+
+    it 'fails' do
+      expect { versioned_get '/', 'v1', using: :header }.to raise_error Grape::Exceptions::MissingVendorOption
+    end
+  end
 end

data/spec/grape/middleware/versioner/param_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Versioner::Param do
   subject { described_class.new(app, **options) }
 

data/spec/grape/middleware/versioner/path_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Versioner::Path do
   subject { described_class.new(app, **options) }
 

data/spec/grape/middleware/versioner_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Middleware::Versioner do
   let(:klass) { described_class }
 

data/spec/grape/named_api_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe 'A named API' do
   subject(:api_name) { NamedAPI.endpoints.last.options[:for].to_s }
 

data/spec/grape/parser_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Parser do
   subject { described_class }
 

data/spec/grape/path_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 module Grape
   describe Path do
     describe '#initialize' do

data/spec/grape/presenters/presenter_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 module Grape
   module Presenters
     module PresenterSpec

data/spec/grape/request_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 module Grape
   describe Request do
     let(:default_method) { 'GET' }

data/spec/grape/util/inheritable_setting_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
 module Grape
   module Util
     describe InheritableSetting do

data/spec/grape/util/inheritable_values_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
 module Grape
   module Util
     describe InheritableValues do

data/spec/grape/util/reverse_stackable_values_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
 module Grape
   module Util
     describe ReverseStackableValues do

data/spec/grape/util/stackable_values_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
 module Grape
   module Util
     describe StackableValues do

data/spec/grape/util/strict_hash_configuration_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
 module Grape
   module Util
     describe 'StrictHashConfiguration' do