From 2a49ac35733cd894cc7c56dc5caebd8690cd4663 Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Wed, 29 Oct 2014 13:09:47 -0500 Subject: [PATCH] Settings for oauth spec. --- web/spec/features/oauth_spec.rb | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/web/spec/features/oauth_spec.rb b/web/spec/features/oauth_spec.rb index 1a7bbcf0a..d485d0295 100644 --- a/web/spec/features/oauth_spec.rb +++ b/web/spec/features/oauth_spec.rb @@ -7,11 +7,11 @@ describe "OAuth", :js=>true, :type => :feature, :capybara_feature => true do before(:all) do @user=FactoryGirl.create(:user, :email => "steven@jamkazam.com") + @default_run_server = Capybara.run_server + puts "@default_run_server:::: #{@default_run_server}" Capybara.run_server = false - Capybara.javascript_driver = :poltergeist - Capybara.current_driver = Capybara.javascript_driver - Capybara.default_wait_time = 15 - Capybara.ignore_hidden_elements = false + Capybara.default_wait_time = 10 + #Capybara.ignore_hidden_elements = false end before(:each) do @@ -20,9 +20,14 @@ describe "OAuth", :js=>true, :type => :feature, :capybara_feature => true do after(:each) do @youtube_client.shutdown if @youtube_client - sleep(5) @youtube_client=nil @user.user_authorizations.destroy_all + page.driver.remove_cookie(:remember_token) + end + + after(:all) do + Capybara.run_server=@default_run_server + @user.destroy end it "client should not authorize a wrong password" do @@ -30,17 +35,14 @@ describe "OAuth", :js=>true, :type => :feature, :capybara_feature => true do authorize_google_user(@youtube_client, @user, "f00bar") }.to raise_error - sleep(5) - save_screenshot("log3.png") @user.reload @user.user_authorizations.count.should eq(0) end it "client should authorize a google user" do - authorize_google_user(@youtube_client, @user, "barfoo") - sleep(5) - save_screenshot("log3.png") - @user.reload + authorize_google_user(@youtube_client, @user, "jam_2112") + save_screenshot("working.png") + @user.reload @user.user_authorizations.count.should eq(1) google_auth = UserAuthorization.google_auth(@user).first