Less metaprogramming in spec

railsware · Feb 18, 2013 · 1075d8e · 1075d8e
1 parent f0cf29e
commit 1075d8e
Showing 1 changed file with 29 additions and 16 deletions.
diff --git a/spec/middleware_spec.rb b/spec/middleware_spec.rb
@@ -97,33 +97,46 @@
   So I can write faster tests
 ) do
 
+  context ":rack_test driver", :driver => :rack_test do
+    context "rack application" do
+      background { Capybara.app = TestRackApp }
+      include_examples "common scenarios"
+      include_examples "rack scenarios"
+    end
+
+    context "sinatra application" do
+      background { Capybara.app = TestSinatraApp }
+      include_examples "common scenarios"
+      include_examples "sinatra scenarios"
+    end
 
-  [:rack_test, :selenium].each do |driver_name|
-    context "with rack application and #{driver_name.inspect} driver", :driver => driver_name do
-      background do
-        Capybara.current_driver.should == driver_name
-        Capybara.app = TestRackApp
-      end
+    context "rails application" do
+      background { Capybara.app = TestRackApp }
+      include_examples "common scenarios"
+      include_examples "rails scenarios"
+    end
+  end
+
+
+
+  context ":selenium driver", :driver => :selenium do
+    context "rack application" do
+      background { Capybara.app = TestRackApp }
       include_examples "common scenarios"
       include_examples "rack scenarios"
     end
 
-    context "with sinatra application and #{driver_name.inspect} driver", :driver => driver_name do
-      background do
-        Capybara.current_driver.should == driver_name
-        Capybara.app = TestSinatraApp
-      end
+    context "sinatra application" do
+      background { Capybara.app = TestSinatraApp }
       include_examples "common scenarios"
       include_examples "sinatra scenarios"
     end
 
-    context "with rails application and #{driver_name.inspect} driver", :driver => driver_name do
-      background do
-        Capybara.current_driver.should == driver_name
-        Capybara.app = TestRailsApp::Application
-      end
+    context "rails application" do
+      background { Capybara.app = TestRackApp }
       include_examples "common scenarios"
       include_examples "rails scenarios"
     end
   end
+
 end