Use webkit driver for Capybara instead of selenium for tests that need dialog handling.

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index b273d9191c875417a9edd5cf90f8ffdf305a007a..1e43d1c522190d7599f5fe4bf9c4c6a1caa193df 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -28,6 +28,7 @@ group :test do
   gem 'selenium-webdriver'
   gem 'capybara'
   gem 'poltergeist'
+  gem 'capybara-webkit'
 end
 
 gem 'jquery-rails'
@@ -59,4 +60,4 @@ gem 'RedCloth'
 gem 'piwik_analytics'
 gem 'httpclient'
 gem 'themes_for_rails'
-gem "deep_merge", :require => 'deep_merge/rails_compat'
\ No newline at end of file
+gem "deep_merge", :require => 'deep_merge/rails_compat'

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 0c65ca80ffb3d764d6446d4ce714e551a90eb3b1..0795f752db7ee4d40a94f47d6addd27382fb75b2 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -48,6 +48,9 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    capybara-webkit (1.1.0)
+      capybara (~> 2.0, >= 2.0.2)
+      json
     childprocess (0.5.1)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
@@ -182,6 +185,7 @@ DEPENDENCIES
   bootstrap-sass (~> 3.1.0)
   bootstrap-x-editable-rails
   capybara
+  capybara-webkit
   coffee-rails (~> 3.2.0)
   deep_merge
   httpclient

diff --git a/apps/workbench/test/integration/users_test.rb b/apps/workbench/test/integration/users_test.rb
index 7555e3a8d2811df14b0f3cf2e7f7f716fb5e19c4..2472ec8b1cbf15e4e1a5a70fbfb61f3bc75283b1 100644 (file)
--- a/apps/workbench/test/integration/users_test.rb
+++ b/apps/workbench/test/integration/users_test.rb
@@ -1,5 +1,4 @@
 require 'integration_helper'
-require "selenium-webdriver"
 
 class UsersTest < ActionDispatch::IntegrationTest
   test "login as active user but not admin" do
@@ -39,7 +38,7 @@ class UsersTest < ActionDispatch::IntegrationTest
   end
 
   test "create a new user" do
-    Capybara.current_driver = :selenium
+    Capybara.current_driver = :webkit
     visit page_with_token('admin_trustedclient')
 
     click_link 'Users'
@@ -81,7 +80,7 @@ class UsersTest < ActionDispatch::IntegrationTest
   end
 
   test "setup the active user" do
-    Capybara.current_driver = :selenium
+    Capybara.current_driver = :webkit
     visit page_with_token('admin_trustedclient')
 
     click_link 'Users'
@@ -133,7 +132,7 @@ class UsersTest < ActionDispatch::IntegrationTest
   end
 
   test "unsetup active user" do
-    Capybara.current_driver = :selenium
+    Capybara.current_driver = :webkit
 
     visit page_with_token('admin_trustedclient')
 
@@ -158,7 +157,6 @@ class UsersTest < ActionDispatch::IntegrationTest
     # unsetup user and verify all the above links are deleted
     click_link 'Admin'
     click_button 'Deactivate Active User'
-    page.driver.browser.switch_to.alert.accept
     sleep(0.1)
 
     # Should now be back in the Attributes tab for the user