Proper restoration of run_server attribute, so spec plays nice with others. (VRFS-2030, VRFS-2031, VRFS-2032).
This commit is contained in:
parent
7b6e90007a
commit
bcd0e7ebef
|
|
@ -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
|
||||
|
|
@ -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 }
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue