grape 1.1.0 → 1.7.1

data/spec/grape/dsl/request_response_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 module Grape
   module DSL
@@ -18,6 +18,7 @@ module Grape
 
     describe RequestResponse do
       subject { Class.new(RequestResponseSpec::Dummy) }
+
       let(:c_type) { 'application/json' }
       let(:format) { 'txt' }
 
@@ -159,34 +160,34 @@ module Grape
 
         describe 'list of exceptions is passed' do
           it 'sets hash of exceptions as rescue handlers' do
-            expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, StandardError => nil)
+            expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, { StandardError => nil })
             expect(subject).to receive(:namespace_stackable).with(:rescue_options, {})
             subject.rescue_from StandardError
           end
 
           it 'rescues only base handlers if rescue_subclasses: false option is passed' do
-            expect(subject).to receive(:namespace_reverse_stackable).with(:base_only_rescue_handlers, StandardError => nil)
-            expect(subject).to receive(:namespace_stackable).with(:rescue_options, rescue_subclasses: false)
+            expect(subject).to receive(:namespace_reverse_stackable).with(:base_only_rescue_handlers, { StandardError => nil })
+            expect(subject).to receive(:namespace_stackable).with(:rescue_options, { rescue_subclasses: false })
             subject.rescue_from StandardError, rescue_subclasses: false
           end
 
           it 'sets given proc as rescue handler for each key in hash' do
             rescue_handler_proc = proc {}
-            expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, StandardError => rescue_handler_proc)
+            expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, { StandardError => rescue_handler_proc })
             expect(subject).to receive(:namespace_stackable).with(:rescue_options, {})
             subject.rescue_from StandardError, rescue_handler_proc
           end
 
           it 'sets given block as rescue handler for each key in hash' do
             rescue_handler_proc = proc {}
-            expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, StandardError => rescue_handler_proc)
+            expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, { StandardError => rescue_handler_proc })
             expect(subject).to receive(:namespace_stackable).with(:rescue_options, {})
             subject.rescue_from StandardError, &rescue_handler_proc
           end
 
           it 'sets a rescue handler declared through :with option for each key in hash' do
             with_block = -> { 'hello' }
-            expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, StandardError => an_instance_of(Proc))
+            expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, { StandardError => an_instance_of(Proc) })
             expect(subject).to receive(:namespace_stackable).with(:rescue_options, {})
             subject.rescue_from StandardError, with: with_block
           end

data/spec/grape/dsl/routing_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 module Grape
   module DSL
@@ -10,7 +10,8 @@ module Grape
 
     describe Routing do
       subject { Class.new(RoutingSpec::Dummy) }
-      let(:proc) { ->() {} }
+
+      let(:proc) { -> {} }
       let(:options) { { a: :b } }
       let(:path) { '/dummy' }
 
@@ -18,7 +19,7 @@ module Grape
         it 'sets a version for route' do
           version = 'v1'
           expect(subject).to receive(:namespace_inheritable).with(:version, [version])
-          expect(subject).to receive(:namespace_inheritable).with(:version_options, using: :path)
+          expect(subject).to receive(:namespace_inheritable).with(:version_options, { using: :path })
           expect(subject.version(version)).to eq(version)
         end
       end
@@ -70,6 +71,16 @@ module Grape
 
           expect(app2.inheritable_setting.to_hash[:namespace_stackable]).to eq(mount_path: ['/app1', '/app2'])
         end
+
+        it 'mounts multiple routes at once' do
+          base_app = Class.new(Grape::API)
+          app1     = Class.new(Grape::API)
+          app2     = Class.new(Grape::API)
+          base_app.mount(app1 => '/app1', app2 => '/app2')
+
+          expect(app1.inheritable_setting.to_hash[:namespace_stackable]).to eq(mount_path: ['/app1'])
+          expect(app2.inheritable_setting.to_hash[:namespace_stackable]).to eq(mount_path: ['/app2'])
+        end
       end
 
       describe '.route' do
@@ -97,7 +108,7 @@ module Grape
         it 'does not duplicate identical endpoints' do
           subject.route(:any)
           expect { subject.route(:any) }
-            .to_not change(subject.endpoints, :count)
+            .not_to change(subject.endpoints, :count)
         end
 
         it 'generates correct endpoint options' do
@@ -221,21 +232,23 @@ module Grape
             allow(subject).to receive(:prepare_routes).and_return(routes)
             subject.routes
           end
-          it 'it does not call prepare_routes again' do
-            expect(subject).to_not receive(:prepare_routes)
+
+          it 'does not call prepare_routes again' do
+            expect(subject).not_to receive(:prepare_routes)
             expect(subject.routes).to eq routes
           end
         end
       end
 
       describe '.route_param' do
+        let!(:options) { { requirements: regex } }
+        let(:regex) { /(.*)/ }
+
         it 'calls #namespace with given params' do
           expect(subject).to receive(:namespace).with(':foo', {}).and_yield
           subject.route_param('foo', {}, &proc {})
         end
 
-        let(:regex) { /(.*)/ }
-        let!(:options) { { requirements: regex } }
         it 'nests requirements option under param name' do
           expect(subject).to receive(:namespace) do |_param, options|
             expect(options[:requirements][:foo]).to eq regex
@@ -246,7 +259,7 @@ module Grape
         it 'does not modify options parameter' do
           allow(subject).to receive(:namespace)
           expect { subject.route_param('foo', options, &proc {}) }
-            .to_not change { options }
+            .not_to change { options }
         end
       end
 

data/spec/grape/dsl/settings_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 module Grape
   module DSL

data/spec/grape/dsl/validations_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 module Grape
   module DSL
@@ -36,10 +36,6 @@ module Grape
           expect(subject.namespace_stackable(:params)).to eq []
         end
 
-        it 'resets documentation params' do
-          expect(subject.route_setting(:description)[:params]).to be_nil
-        end
-
         it 'does not reset documentation description' do
           expect(subject.route_setting(:description)[:description]).to eq 'lol'
         end
@@ -54,17 +50,6 @@ module Grape
           expect { subject.params { raise 'foo' } }.to raise_error RuntimeError, 'foo'
         end
       end
-
-      describe '.document_attribute' do
-        before do
-          subject.document_attribute([full_name: 'xxx'], foo: 'bar')
-        end
-
-        it 'creates a param documentation' do
-          expect(subject.namespace_stackable(:params)).to eq(['xxx' => { foo: 'bar' }])
-          expect(subject.route_setting(:description)).to eq(params: { 'xxx' => { foo: 'bar' } })
-        end
-      end
     end
   end
 end