spec/grape/validations/validators/mutual_exclusion_spec.rb in grape-1.6.0 vs spec/grape/validations/validators/mutual_exclusion_spec.rb in grape-1.6.1

@@ -1,97 +1,91 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
 
-describe Grape::Validations::MutualExclusionValidator do
-  describe '#validate!' do
-    subject(:validate) { post path, params }
+describe Grape::Validations::Validators::MutualExclusionValidator do
+  let_it_be(:app) do
+    Class.new(Grape::API) do
+      rescue_from Grape::Exceptions::ValidationErrors do |e|
+        error!(e.errors.transform_keys! { |key| key.join(',') }, 400)
+      end
 
-    module ValidationsSpec
-      module MutualExclusionValidatorSpec
-        class API < Grape::API
-          rescue_from Grape::Exceptions::ValidationErrors do |e|
-            error!(e.errors.transform_keys! { |key| key.join(',') }, 400)
-          end
+      params do
+        optional :beer
+        optional :wine
+        optional :grapefruit
+        mutually_exclusive :beer, :wine, :grapefruit
+      end
+      post do
+      end
 
-          params do
-            optional :beer
-            optional :wine
-            optional :grapefruit
-            mutually_exclusive :beer, :wine, :grapefruit
-          end
-          post do
-          end
+      params do
+        optional :beer
+        optional :wine
+        optional :grapefruit
+        optional :other
+        mutually_exclusive :beer, :wine, :grapefruit
+      end
+      post 'mixed-params' do
+      end
 
-          params do
-            optional :beer
-            optional :wine
-            optional :grapefruit
-            optional :other
-            mutually_exclusive :beer, :wine, :grapefruit
-          end
-          post 'mixed-params' do
-          end
+      params do
+        optional :beer
+        optional :wine
+        optional :grapefruit
+        mutually_exclusive :beer, :wine, :grapefruit, message: 'you should not mix beer and wine'
+      end
+      post '/custom-message' do
+      end
 
-          params do
-            optional :beer
-            optional :wine
-            optional :grapefruit
-            mutually_exclusive :beer, :wine, :grapefruit, message: 'you should not mix beer and wine'
-          end
-          post '/custom-message' do
-          end
+      params do
+        requires :item, type: Hash do
+          optional :beer
+          optional :wine
+          optional :grapefruit
+          mutually_exclusive :beer, :wine, :grapefruit
+        end
+      end
+      post '/nested-hash' do
+      end
 
-          params do
-            requires :item, type: Hash do
-              optional :beer
-              optional :wine
-              optional :grapefruit
-              mutually_exclusive :beer, :wine, :grapefruit
-            end
-          end
-          post '/nested-hash' do
-          end
+      params do
+        optional :item, type: Hash do
+          optional :beer
+          optional :wine
+          optional :grapefruit
+          mutually_exclusive :beer, :wine, :grapefruit
+        end
+      end
+      post '/nested-optional-hash' do
+      end
 
-          params do
-            optional :item, type: Hash do
-              optional :beer
-              optional :wine
-              optional :grapefruit
-              mutually_exclusive :beer, :wine, :grapefruit
-            end
-          end
-          post '/nested-optional-hash' do
-          end
+      params do
+        requires :items, type: Array do
+          optional :beer
+          optional :wine
+          optional :grapefruit
+          mutually_exclusive :beer, :wine, :grapefruit
+        end
+      end
+      post '/nested-array' do
+      end
 
-          params do
-            requires :items, type: Array do
-              optional :beer
-              optional :wine
-              optional :grapefruit
-              mutually_exclusive :beer, :wine, :grapefruit
-            end
+      params do
+        requires :items, type: Array do
+          requires :nested_items, type: Array do
+            optional :beer, :wine, :grapefruit, type: Grape::API::Boolean
+            mutually_exclusive :beer, :wine, :grapefruit
           end
-          post '/nested-array' do
-          end
-
-          params do
-            requires :items, type: Array do
-              requires :nested_items, type: Array do
-                optional :beer, :wine, :grapefruit, type: Boolean
-                mutually_exclusive :beer, :wine, :grapefruit
-              end
-            end
-          end
-          post '/deeply-nested-array' do
-          end
         end
       end
+      post '/deeply-nested-array' do
+      end
     end
+  end
 
-    def app
-      ValidationsSpec::MutualExclusionValidatorSpec::API
-    end
+  describe '#validate!' do
+    subject(:validate) { post path, params }
 
     context 'when all mutually exclusive params are present' do
       let(:path) { '/' }
       let(:params) { { beer: true, wine: true, grapefruit: true } }