From bcd0e7ebefc08520cbd1e1ba03cc50e0e79e9056 Mon Sep 17 00:00:00 2001
From: Steven Miers <steven.miers@gmail.com>
Date: Thu, 30 Oct 2014 12:35:59 -0500
Subject: [PATCH] Proper restoration of run_server attribute, so spec plays
 nice with others.  (VRFS-2030, VRFS-2031, VRFS-2032).

---
 web/spec/features/{auth_spec.rb => oauth_spec.rb} | 12 ++++++------
 web/spec/features/youtube_spec.rb                 |  2 +-
 web/spec/spec_helper.rb                           |  6 ------
 3 files changed, 7 insertions(+), 13 deletions(-)
 rename web/spec/features/{auth_spec.rb => oauth_spec.rb} (83%)

diff --git a/web/spec/features/auth_spec.rb b/web/spec/features/oauth_spec.rb
similarity index 83%
rename from web/spec/features/auth_spec.rb
rename to web/spec/features/oauth_spec.rb
index d3839724d..2aca6d62b 100644
--- a/web/spec/features/auth_spec.rb
+++ b/web/spec/features/oauth_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'youtube_client'
 
-describe "Auth", :js=>true, :type=>:feature, :capybara_feature=>true, :skip_server=>true  do
+describe "OAuth", :js=>true, :type=>:feature, :capybara_feature=>true do
 
   subject { page }
 
@@ -9,10 +9,9 @@ describe "Auth", :js=>true, :type=>:feature, :capybara_feature=>true, :skip_serv
     Capybara.javascript_driver = :poltergeist
     Capybara.current_driver = Capybara.javascript_driver
     Capybara.default_wait_time = 10
-    
-    @user=FactoryGirl.create(:user, :email=>"steven@jamkazam.com")
-    puts "Capybara.run_server:::: #{Capybara.run_server}"
-    #Capybara.ignore_hidden_elements = false        
+    @previous_run_server = Capybara.run_server
+    Capybara.run_server = false
+    @user=FactoryGirl.create(:user, :email=>"steven@jamkazam.com")    
   end
 
   before(:each) do
@@ -27,7 +26,8 @@ describe "Auth", :js=>true, :type=>:feature, :capybara_feature=>true, :skip_serv
   end
 
   after(:all) do
-    @user.destroy        
+    @user.destroy 
+    Capybara.run_server = @previous_run_server       
   end
 
   it "client should not authorize a wrong password" do      
diff --git a/web/spec/features/youtube_spec.rb b/web/spec/features/youtube_spec.rb
index 1a1dfe678..2a87ea62e 100644
--- a/web/spec/features/youtube_spec.rb
+++ b/web/spec/features/youtube_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'youtube_client'
 
-describe "OAuth", :js=>true, :type => :feature, :capybara_feature => true, :slow=>true  do
+describe "YouTube", :js=>true, :type => :feature, :capybara_feature => true, :slow=>true  do
 
   subject { page }
 
diff --git a/web/spec/spec_helper.rb b/web/spec/spec_helper.rb
index def1ca4ed..483a30851 100644
--- a/web/spec/spec_helper.rb
+++ b/web/spec/spec_helper.rb
@@ -197,11 +197,6 @@ bputs "before register capybara"
         page.driver.headers = { 'User-Agent' => 'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0' }
       end
 
-      if example.metadata[:skip_server]
-        @previous_run_server = Capybara.run_server
-        Capybara.run_server = false
-      end
-    
     end
 
     config.before(:each, :js => true) do
@@ -218,7 +213,6 @@ bputs "before register capybara"
 
       Capybara.reset_sessions!
       reset_session_mapper
-      Capybara.run_server = @previous_run_server    
     end
 
     config.after(:each) do