Introduce controller type for specs

lexun · Feb 18, 2015 · 4b3f850 · 4b3f850
1 parent 5d09e12
commit 4b3f850
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/spec/lib/launchpad/gui/controllers/main_controller_spec.rb b/spec/lib/launchpad/gui/controllers/main_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Launchpad::MainController do
+describe Launchpad::MainController, type: :controller do
   let(:stage_class) { described_class::Stage }
   let(:stage_double) { double 'stage' }
 
@@ -9,9 +9,6 @@
   end
 
   before do
-    described_class.define_singleton_method(:initialize) {}
-    described_class.define_singleton_method(:new) { allocate }
-
     allow(stage_class).to receive(:new).and_return stage_double
     messages.each { |message| allow(stage_double).to receive message }
 

diff --git a/spec/lib/launchpad/gui/controllers/options_controller_spec.rb b/spec/lib/launchpad/gui/controllers/options_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Launchpad::OptionsController do
+describe Launchpad::OptionsController, type: :controller do
   subject do
     described_class.new.tap do |controller|
       controller.instance_variable_set :@stage, stage_double
@@ -9,11 +9,6 @@
 
   let(:stage_double) { double 'stage', close: true }
 
-  before do
-    described_class.define_singleton_method(:initialize) {}
-    described_class.define_singleton_method(:new) { allocate }
-  end
-
   describe '#cancel' do
     before { subject.cancel }
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -8,4 +8,10 @@
 RSpec.configure do |config|
   # Exit the javafx toolkit after running specs
   config.after(:suite) { JavaFXImpl::PlatformImpl.tkExit }
+
+  # Remove jrubyfx controller overrides
+  config.before(:example, type: :controller) do
+    described_class.define_singleton_method(:initialize) {}
+    described_class.define_singleton_method(:new) { allocate }
+  end
 end