Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
This commit is contained in:
commit
6e55f3617a
|
|
@ -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}'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
|
||||
|
|
@ -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}'s 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}'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']",
|
||||
|
|
@ -78,6 +84,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
|
|||
end
|
||||
|
||||
in_client(user1) do
|
||||
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" )
|
||||
|
|
@ -88,12 +95,13 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
|
|||
end
|
||||
|
||||
in_client(user2) do
|
||||
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 }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue