Fix: namespaced test classes, closes #1165.

Author: dblock

spec/grape/api/custom_validations_spec.rb

@@ -2,11 +2,13 @@
 
 describe Grape::Validations do
   before do
-    class DefaultLength < Grape::Validations::Base
-      def validate_param!(attr_name, params)
-        @option = params[:max].to_i if params.key?(:max)
-        return if params[attr_name].length <= @option
-        fail Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: "must be at the most #{@option} characters long"
+    module CustomValidationsSpec
+      class DefaultLength < Grape::Validations::Base
+        def validate_param!(attr_name, params)
+          @option = params[:max].to_i if params.key?(:max)
+          return if params[attr_name].length <= @option
+          fail Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: "must be at the most #{@option} characters long"
+        end
       end
     end
   end

spec/grape/api/deeply_included_options_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module API
+module DeeplyIncludedOptionsSpec
   module Defaults
     extend ActiveSupport::Concern
     included do
@@ -11,11 +11,11 @@ module Defaults
   module Admin
     module Defaults
       extend ActiveSupport::Concern
-      include API::Defaults
+      include DeeplyIncludedOptionsSpec::Defaults
     end
 
     class Users < Grape::API
-      include API::Admin::Defaults
+      include DeeplyIncludedOptionsSpec::Admin::Defaults
 
       resource :users do
         get do
@@ -24,14 +24,14 @@ class Users < Grape::API
       end
     end
   end
-end
 
-class Main < Grape::API
-  mount API::Admin::Users
+  class Main < Grape::API
+    mount DeeplyIncludedOptionsSpec::Admin::Users
+  end
 end
 
 describe Grape::API do
-  subject { Main }
+  subject { DeeplyIncludedOptionsSpec::Main }
 
   def app
     subject

spec/grape/api/nested_helpers_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Grape::API::Helpers do
-  subject do
+  module NestedHelpersSpec
     module HelperMethods
       extend Grape::API::Helpers
       def current_user
@@ -28,8 +28,10 @@ class Nested < Grape::API
     class Main < Grape::API
       mount Nested
     end
+  end
 
-    Main
+  subject do
+    NestedHelpersSpec::Main
   end
 
   def app

spec/grape/api/shared_helpers_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
 describe Grape::API::Helpers do
-  module SharedParams
-    extend Grape::API::Helpers
+  subject do
+    shared_params = Module.new do
+      extend Grape::API::Helpers
 
-    params :pagination do
-      optional :page, type: Integer
-      optional :size, type: Integer
+      params :pagination do
+        optional :page, type: Integer
+        optional :size, type: Integer
+      end
     end
-  end
 
-  subject do
     Class.new(Grape::API) do
-      helpers SharedParams
+      helpers shared_params
       format :json
 
       params do

spec/grape/api_spec.rb

@@ -1309,21 +1309,23 @@ def three
 
     context 'CustomError subclass of Grape::Exceptions::Base' do
       before do
-        class CustomError < Grape::Exceptions::Base; end
+        module ApiSpec
+          class CustomError < Grape::Exceptions::Base; end
+        end
       end
 
       it 'does not re-raise exceptions of type Grape::Exceptions::Base' do
-        subject.get('/custom_exception') { fail CustomError }
+        subject.get('/custom_exception') { fail ApiSpec::CustomError }
 
         expect { get '/custom_exception' }.not_to raise_error
       end
 
       it 'rescues custom grape exceptions' do
-        subject.rescue_from CustomError do |e|
+        subject.rescue_from ApiSpec::CustomError do |e|
           rack_response('New Error', e.status)
         end
         subject.get '/custom_error' do
-          fail CustomError, status: 400, message: 'Custom Error'
+          fail ApiSpec::CustomError, status: 400, message: 'Custom Error'
         end
 
         get '/custom_error'
@@ -1474,21 +1476,23 @@ def rescue_arg_error
 
   describe '.rescue_from klass, rescue_subclasses: boolean' do
     before do
-      module APIErrors
-        class ParentError < StandardError; end
-        class ChildError < ParentError; end
+      module ApiSpec
+        module APIErrors
+          class ParentError < StandardError; end
+          class ChildError < ParentError; end
+        end
       end
     end
 
     it 'rescues error as well as subclass errors with rescue_subclasses option set' do
-      subject.rescue_from APIErrors::ParentError, rescue_subclasses: true do |e|
+      subject.rescue_from ApiSpec::APIErrors::ParentError, rescue_subclasses: true do |e|
         rack_response("rescued from #{e.class.name}", 500)
       end
       subject.get '/caught_child' do
-        fail APIErrors::ChildError
+        fail ApiSpec::APIErrors::ChildError
       end
       subject.get '/caught_parent' do
-        fail APIErrors::ParentError
+        fail ApiSpec::APIErrors::ParentError
       end
       subject.get '/uncaught_parent' do
         fail StandardError
@@ -1502,25 +1506,25 @@ class ChildError < ParentError; end
     end
 
     it 'sets rescue_subclasses to true by default' do
-      subject.rescue_from APIErrors::ParentError do |e|
+      subject.rescue_from ApiSpec::APIErrors::ParentError do |e|
         rack_response("rescued from #{e.class.name}", 500)
       end
       subject.get '/caught_child' do
-        fail APIErrors::ChildError
+        fail ApiSpec::APIErrors::ChildError
       end
 
       get '/caught_child'
       expect(last_response.status).to eql 500
     end
 
     it 'does not rescue child errors if rescue_subclasses is false' do
-      subject.rescue_from APIErrors::ParentError, rescue_subclasses: false do |e|
+      subject.rescue_from ApiSpec::APIErrors::ParentError, rescue_subclasses: false do |e|
         rack_response("rescued from #{e.class.name}", 500)
       end
       subject.get '/uncaught' do
-        fail APIErrors::ChildError
+        fail ApiSpec::APIErrors::ChildError
       end
-      expect { get '/uncaught' }.to raise_error(APIErrors::ChildError)
+      expect { get '/uncaught' }.to raise_error(ApiSpec::APIErrors::ChildError)
     end
   end
 
@@ -1572,15 +1576,17 @@ class ChildError < ParentError; end
 
     context 'class' do
       before :each do
-        class CustomErrorFormatter
-          def self.call(message, _backtrace, _options, _env)
-            "message: #{message} @backtrace"
+        module ApiSpec
+          class CustomErrorFormatter
+            def self.call(message, _backtrace, _options, _env)
+              "message: #{message} @backtrace"
+            end
           end
         end
       end
       it 'returns a custom error format' do
         subject.rescue_from :all, backtrace: true
-        subject.error_formatter :txt, CustomErrorFormatter
+        subject.error_formatter :txt, ApiSpec::CustomErrorFormatter
         subject.get '/exception' do
           fail 'rain!'
         end
@@ -1592,16 +1598,18 @@ def self.call(message, _backtrace, _options, _env)
     describe 'with' do
       context 'class' do
         before :each do
-          class CustomErrorFormatter
-            def self.call(message, _backtrace, _option, _env)
-              "message: #{message} @backtrace"
+          module ApiSpec
+            class CustomErrorFormatter
+              def self.call(message, _backtrace, _option, _env)
+                "message: #{message} @backtrace"
+              end
             end
           end
         end
 
         it 'returns a custom error format' do
           subject.rescue_from :all, backtrace: true
-          subject.error_formatter :txt, with: CustomErrorFormatter
+          subject.error_formatter :txt, with: ApiSpec::CustomErrorFormatter
           subject.get('/exception') { fail 'rain!' }
 
           get '/exception'
@@ -1713,15 +1721,17 @@ def self.call(message, _backtrace, _option, _env)
       end
     end
     context 'custom formatter class' do
-      module CustomFormatter
-        def self.call(object, _env)
-          "{\"custom_formatter\":\"#{object[:some]}\"}"
+      module ApiSpec
+        module CustomFormatter
+          def self.call(object, _env)
+            "{\"custom_formatter\":\"#{object[:some]}\"}"
+          end
         end
       end
       before :each do
         subject.content_type :json, 'application/json'
         subject.content_type :custom, 'application/custom'
-        subject.formatter :custom, CustomFormatter
+        subject.formatter :custom, ApiSpec::CustomFormatter
         subject.get :simple do
           { some: 'hash' }
         end
@@ -1765,15 +1775,17 @@ def self.call(object, _env)
       end
     end
     context 'custom parser class' do
-      module CustomParser
-        def self.call(object, _env)
-          { object.to_sym => object.to_s.reverse }
+      module ApiSpec
+        module CustomParser
+          def self.call(object, _env)
+            { object.to_sym => object.to_s.reverse }
+          end
         end
       end
       before :each do
         subject.content_type :txt, 'text/plain'
         subject.content_type :custom, 'text/custom'
-        subject.parser :custom, CustomParser
+        subject.parser :custom, ApiSpec::CustomParser
         subject.put :simple do
           params[:simple]
         end

spec/grape/entity_spec.rb

@@ -45,22 +45,24 @@ def app
       entity = Class.new(Grape::Entity)
       allow(entity).to receive(:represent).and_return('Hiya')
 
-      class TestObject
-      end
+      module EntitySpec
+        class TestObject
+        end
 
-      class FakeCollection
-        def first
-          TestObject.new
+        class FakeCollection
+          def first
+            TestObject.new
+          end
         end
       end
 
-      subject.represent TestObject, with: entity
+      subject.represent EntitySpec::TestObject, with: entity
       subject.get '/example' do
-        present [TestObject.new]
+        present [EntitySpec::TestObject.new]
       end
 
       subject.get '/example2' do
-        present FakeCollection.new
+        present EntitySpec::FakeCollection.new
       end
 
       get '/example'

spec/grape/middleware/base_spec.rb

@@ -82,18 +82,20 @@
     end
 
     context 'defaults' do
-      class ExampleWare < Grape::Middleware::Base
-        def default_options
-          { monkey: true }
+      module BaseSpec
+        class ExampleWare < Grape::Middleware::Base
+          def default_options
+            { monkey: true }
+          end
         end
       end
 
       it 'persists the default options' do
-        expect(ExampleWare.new(blank_app).options[:monkey]).to be true
+        expect(BaseSpec::ExampleWare.new(blank_app).options[:monkey]).to be true
       end
 
       it 'overrides default options when provided' do
-        expect(ExampleWare.new(blank_app, monkey: false).options[:monkey]).to be false
+        expect(BaseSpec::ExampleWare.new(blank_app, monkey: false).options[:monkey]).to be false
       end
     end
   end