Use poltergeist instaead of capybara-webkit

2 files changed, 23 insertions, 5 deletions

diff --git a/features/steps/project/project_issues.rb b/features/steps/project/project_issues.rb
index a9a33650068..23142f5cb1e 100644
--- a/features/steps/project/project_issues.rb
+++ b/features/steps/project/project_issues.rb
@@ -96,8 +96,7 @@ class ProjectIssues < Spinach::FeatureSteps
   end
 
   Then 'I should see selected milestone with title "v3.0"' do
-    issues_milestone_selector = "#issue_milestone_id_chzn/a"
-    wait_until { page.has_content?("Details") }
+    issues_milestone_selector = "#milestone_id_chzn > a"
     page.find(issues_milestone_selector).should have_content("v3.0")
   end
 
diff --git a/features/support/env.rb b/features/support/env.rb
index 6d49c25a8ba..1a72d765197 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -11,14 +11,33 @@ end
 
 Dir["#{Rails.root}/features/steps/shared/*.rb"].each {|file| require file}
 
+#
+# Stub gitolite
+#
 include GitoliteStub
 
 WebMock.allow_net_connect!
-Capybara.javascript_driver = :webkit
+
+#
+# JS driver
+#
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
+Spinach.hooks.on_tag("javascript") do
+  ::Capybara.current_driver = ::Capybara.javascript_driver
+  ::Capybara.default_wait_time = 5
+end
+
 
 DatabaseCleaner.strategy = :truncation
-Spinach.hooks.before_scenario { DatabaseCleaner.start }
-Spinach.hooks.after_scenario  { DatabaseCleaner.clean }
+
+Spinach.hooks.before_scenario do
+  DatabaseCleaner.start
+end
+
+Spinach.hooks.after_scenario do
+  DatabaseCleaner.clean
+end
 
 Spinach.hooks.before_run do
   RSpec::Mocks::setup self