clean up a bit

ruby-grape · Sep 21, 2016 · 2ceafaa · 2ceafaa
1 parent 083b19a
commit 2ceafaa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/app/controllers/grape_swagger_rails/application_controller.rb b/app/controllers/grape_swagger_rails/application_controller.rb
@@ -1,6 +1,5 @@
 module GrapeSwaggerRails
   class ApplicationController < ActionController::Base
-
     if Rails::VERSION::MAJOR >= 4
       before_action { run_before_action }
     else
@@ -13,8 +12,8 @@ def index
     private
 
     def run_before_action
-      callback = [GrapeSwaggerRails.options.before_action, GrapeSwaggerRails.options.before_filter].compact.first
-      instance_exec(request, &callback) if callback
+      return unless GrapeSwaggerRails.options.before_action
+      instance_exec(request, &GrapeSwaggerRails.options.before_action)
     end
   end
 end
diff --git a/spec/features/swagger_spec.rb b/spec/features/swagger_spec.rb
@@ -101,12 +101,10 @@
     end
     context '#before_filter' do
       before do
-        GrapeSwaggerRails.options.before_filter { true }
+        allow(ActiveSupport::Deprecation).to receive(:warn)
       end
       it 'throws deprecation warning' do
-        allow(ActiveSupport::Deprecation).to receive(:warn)
-
-        visit '/swagger'
+        GrapeSwaggerRails.options.before_filter { true }
 
         expect(ActiveSupport::Deprecation).to have_received(:warn).with('This option is deprecated ' \
           'and going to be removed in 0.3.0. Please use `before_action` instead')