From 34248474e78bb20f3f92c001df85236d8bbae628 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Thu, 31 Jul 2014 21:48:52 -0500 Subject: [PATCH 1/4] This should fix the monitor job -- but it's about 4 times slower now --- monitor/spec/spec_helper.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/monitor/spec/spec_helper.rb b/monitor/spec/spec_helper.rb index 5b3882d80..93bd9cb49 100755 --- a/monitor/spec/spec_helper.rb +++ b/monitor/spec/spec_helper.rb @@ -34,11 +34,11 @@ RSpec.configure do |config| end end -#Capybara.register_driver :poltergeist do |app| -# Capybara::Poltergeist::Driver.new(app, { phantomjs_logger: File.open('console.log', 'w') }) -#end -Capybara.javascript_driver = :poltergeist -Capybara.default_driver = :poltergeist +Capybara.register_driver :poltergeist do |app| + Capybara::Poltergeist::Driver.new(app, { :timeout=>120, js_errors: false }) +end +#Capybara.javascript_driver = :poltergeist +#Capybara.default_driver = :poltergeist Capybara.run_server = false # since we're testing an app outside this project Capybara.default_wait_time = 15 # ^^ ditto From 737b815fbe1a78969e2d05d35e00fcd09d68c079 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Thu, 31 Jul 2014 22:48:44 -0500 Subject: [PATCH 2/4] help readability of console output --- monitor/spec/production_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/monitor/spec/production_spec.rb b/monitor/spec/production_spec.rb index 5236173a5..209d81de2 100755 --- a/monitor/spec/production_spec.rb +++ b/monitor/spec/production_spec.rb @@ -20,6 +20,9 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe Capybara.run_server = false end + before { puts '\n' } + after { puts '\n\n' } + TestUser = Class.new do attr_accessor :email, :password, :first_name, :last_name, :id @@ -46,6 +49,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe it "is possible for #{user1} to sign in and not get disconnected within 30 seconds" do in_client(user1) do + puts '\n *** user1 client *** \n' sign_in_poltergeist user1 repeat_for(30.seconds) do expect(page).to_not have_selector('.no-websocket-connection') #looks for reconnect dialog every 1 second @@ -57,6 +61,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe # this example heavily based on text_message_spec.rb in 'web' in_client(user1) do + puts '\n *** user1 client *** \n' sign_in_poltergeist(user1) end @@ -65,6 +70,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe test_goodbye = "#{SecureRandom.uuid} - OK bye!" in_client(user2) do + puts '\n *** user2 client *** \n' sign_in_poltergeist(user2) expect(page).to have_xpath( "//div[@class='friend-name' and @user-id='#{user1.id}']/span[@class='friend-status']", @@ -78,6 +84,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe end in_client(user1) do + puts '\n *** user1 client *** \n' expect(page).to have_xpath( "//div[@class='friend-name' and @user-id='#{user2.id}']/span[@class='friend-status']", :text => "Available" ) @@ -88,6 +95,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe end in_client(user2) do + puts '\n *** user2 client *** \n' find('.previous-message-text', text: test_response) send_text_message(test_goodbye, close_on_send: true) end From 16587361085e9dc2ee8adfa31e3e982906311f03 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Thu, 31 Jul 2014 23:03:34 -0500 Subject: [PATCH 3/4] Fixing console output --- monitor/spec/production_spec.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/monitor/spec/production_spec.rb b/monitor/spec/production_spec.rb index 209d81de2..c239f3371 100755 --- a/monitor/spec/production_spec.rb +++ b/monitor/spec/production_spec.rb @@ -20,8 +20,8 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe Capybara.run_server = false end - before { puts '\n' } - after { puts '\n\n' } + before { puts "\n" } + after { puts "\n\n" } TestUser = Class.new do attr_accessor :email, :password, :first_name, :last_name, :id @@ -49,7 +49,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe it "is possible for #{user1} to sign in and not get disconnected within 30 seconds" do in_client(user1) do - puts '\n *** user1 client *** \n' + puts "\n *** user1 client *** \n" sign_in_poltergeist user1 repeat_for(30.seconds) do expect(page).to_not have_selector('.no-websocket-connection') #looks for reconnect dialog every 1 second @@ -61,7 +61,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe # this example heavily based on text_message_spec.rb in 'web' in_client(user1) do - puts '\n *** user1 client *** \n' + puts "\n *** user1 client *** \n" sign_in_poltergeist(user1) end @@ -70,7 +70,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe test_goodbye = "#{SecureRandom.uuid} - OK bye!" in_client(user2) do - puts '\n *** user2 client *** \n' + puts "\n *** user2 client *** \n" sign_in_poltergeist(user2) expect(page).to have_xpath( "//div[@class='friend-name' and @user-id='#{user1.id}']/span[@class='friend-status']", @@ -84,7 +84,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe end in_client(user1) do - puts '\n *** user1 client *** \n' + puts "\n *** user1 client *** \n" expect(page).to have_xpath( "//div[@class='friend-name' and @user-id='#{user2.id}']/span[@class='friend-status']", :text => "Available" ) @@ -95,7 +95,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe end in_client(user2) do - puts '\n *** user2 client *** \n' + puts "\n *** user2 client *** \n" find('.previous-message-text', text: test_response) send_text_message(test_goodbye, close_on_send: true) end From e610e5f28287e5f59899929b6f338a81a538f0f6 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Fri, 1 Aug 2014 11:06:14 -0500 Subject: [PATCH 4/4] Improve debug output --- monitor/spec/production_spec.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/monitor/spec/production_spec.rb b/monitor/spec/production_spec.rb index c239f3371..ded20aec1 100755 --- a/monitor/spec/production_spec.rb +++ b/monitor/spec/production_spec.rb @@ -49,7 +49,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe it "is possible for #{user1} to sign in and not get disconnected within 30 seconds" do in_client(user1) do - puts "\n *** user1 client *** \n" + puts "\n *** #{user1}'s client *** \n" sign_in_poltergeist user1 repeat_for(30.seconds) do expect(page).to_not have_selector('.no-websocket-connection') #looks for reconnect dialog every 1 second @@ -61,7 +61,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe # this example heavily based on text_message_spec.rb in 'web' in_client(user1) do - puts "\n *** user1 client *** \n" + puts "\n *** #{user1}'s client *** \n" sign_in_poltergeist(user1) end @@ -70,7 +70,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe test_goodbye = "#{SecureRandom.uuid} - OK bye!" in_client(user2) do - puts "\n *** user2 client *** \n" + puts "\n *** #{user2}'s client *** \n" sign_in_poltergeist(user2) expect(page).to have_xpath( "//div[@class='friend-name' and @user-id='#{user1.id}']/span[@class='friend-status']", @@ -84,7 +84,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe end in_client(user1) do - puts "\n *** user1 client *** \n" + puts "\n *** #{user1}'s client *** \n" expect(page).to have_xpath( "//div[@class='friend-name' and @user-id='#{user2.id}']/span[@class='friend-status']", :text => "Available" ) @@ -95,13 +95,13 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe end in_client(user2) do - puts "\n *** user2 client *** \n" + puts "\n *** #{user2}'s client *** \n" find('.previous-message-text', text: test_response) send_text_message(test_goodbye, close_on_send: true) end - in_client(user1) { sign_out_poltergeist } - in_client(user2) { sign_out_poltergeist } + in_client(user1) { puts "\n *** #{user1}'s client *** \n"; sign_out_poltergeist } + in_client(user2) { puts "\n *** #{user2}'s client *** \n"; sign_out_poltergeist } end let(:queue_limit) { 5 }