From b4fdf970565eaf4451aba262c1a80f73983743ee Mon Sep 17 00:00:00 2001 From: Taylor Griffin Date: Thu, 31 Jul 2014 14:48:35 +1000 Subject: [PATCH] switch to poltergeist-phantomjs from selenium for js webdriver --- Gemfile | 2 +- Gemfile.lock | 19 ++++++++----------- app/assets/javascripts/plantings.js.coffee | 11 ++++++----- spec/spec_helper.rb | 2 ++ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 05d2295ab..c45a5bab5 100644 --- a/Gemfile +++ b/Gemfile @@ -126,7 +126,7 @@ group :development, :test do gem 'webrat' # provides HTML matchers for view tests gem 'database_cleaner', '~> 1.3.0' gem 'capybara', '~> 2.4.1' # for feature tests - gem 'selenium-webdriver', '~> 2.42.0' # for testing in the browser + gem 'poltergeist', '~> 1.5.1' # for headless JS testing gem 'factory_girl_rails', '~> 4.0' # for creating test data gem 'coveralls', require: false # coverage analysis diff --git a/Gemfile.lock b/Gemfile.lock index 669d8f4d3..fd5b4d8fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,9 +79,8 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.1) + cliver (0.3.2) coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -129,7 +128,6 @@ GEM factory_girl_rails (4.4.1) factory_girl (~> 4.4.0) railties (>= 3.0.0) - ffi (1.9.3) figaro (0.7.0) bundler (~> 1.0) rails (>= 3, < 5) @@ -207,6 +205,11 @@ GEM omniauth-oauth (~> 1.0) orm_adapter (0.5.0) pg (0.17.1) + poltergeist (1.5.1) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) polyglot (0.3.5) pry (0.10.0) coderay (~> 1.1.0) @@ -258,17 +261,11 @@ GEM rspec-core (~> 2.12.0) rspec-expectations (~> 2.12.0) rspec-mocks (~> 2.12.0) - rubyzip (1.1.6) sass (3.2.19) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.42.0) - childprocess (>= 0.5.0) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0.4) simplecov (0.9.0) docile (~> 1.1.0) multi_json @@ -307,7 +304,7 @@ GEM nokogiri (>= 1.2.0) rack (>= 1.0) rack-test (>= 0.5.3) - websocket (1.0.7) + websocket-driver (0.3.4) will_paginate (3.0.7) xpath (2.0.0) nokogiri (~> 1.3) @@ -358,6 +355,7 @@ DEPENDENCIES omniauth-flickr (>= 0.0.15) omniauth-twitter pg + poltergeist (~> 1.5.1) pry (~> 0.10.0) rack (~> 1.4.5) rails (= 3.2.13) @@ -365,7 +363,6 @@ DEPENDENCIES rake (>= 10.0.0) rspec-rails (~> 2.12.1) sass-rails (~> 3.2.3) - selenium-webdriver (~> 2.42.0) therubyracer (~> 0.12) twitter-bootstrap-rails! uglifier (>= 1.0.3) diff --git a/app/assets/javascripts/plantings.js.coffee b/app/assets/javascripts/plantings.js.coffee index e5b559bb7..0bbf50e8d 100644 --- a/app/assets/javascripts/plantings.js.coffee +++ b/app/assets/javascripts/plantings.js.coffee @@ -19,9 +19,10 @@ jQuery -> $( '#planting_crop_id' ).val( ui.item.id ) false autoFocus: true - .data( 'uiAutocomplete' )._renderItem = ( ul, item ) -> - $( '
  • ' ) - .data( 'item.autocomplete', item ) - .append( "#{item.name}" ) - .appendTo( ul ) + if el.data( 'uiAutocomplete' ) + el.data( 'uiAutocomplete' )._renderItem = ( ul, item ) -> + $( '
  • ' ) + .data( 'item.autocomplete', item ) + .append( "#{item.name}" ) + .appendTo( ul ) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4e9bf8273..e80cc144e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -6,6 +6,8 @@ require 'rspec/autorun' require 'coveralls' require 'simplecov' require 'capybara' +require 'capybara/poltergeist' +Capybara.javascript_driver = :poltergeist include Warden::Test::Helpers