Skip to content

Commit ea00715

Browse files
committed
Move from capybara-webkit to Poltergeist for Capybara js driver
Add Gem Poltergeist and es5-shim-rails Add require es5-shim to application.js Change capybara driver to poltergeist within rails_helper.
1 parent 5bdca4e commit ea00715

File tree

5 files changed

+22
-8
lines changed

5 files changed

+22
-8
lines changed

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ gem "turbolinks"
2626
gem "jbuilder"
2727
# bundle exec rake doc:rails generates the API under doc/api.
2828
gem "sdoc", group: :doc
29+
gem "es5-shim-rails"
2930

3031
# Use ActiveModel has_secure_password
3132
# gem "bcrypt", "~> 3.1.7"
@@ -78,7 +79,7 @@ group :test do
7879
gem "rspec-rails"
7980
gem "capybara"
8081
gem "capybara-screenshot"
81-
gem "capybara-webkit"
82+
gem "poltergeist"
8283
gem "database_cleaner"
8384
gem "launchy"
8485
end

Gemfile.lock

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ GEM
7474
capybara-screenshot (1.0.11)
7575
capybara (>= 1.0, < 3)
7676
launchy
77-
capybara-webkit (1.6.0)
78-
capybara (>= 2.3.0, < 2.5.0)
79-
json
77+
cliver (0.3.2)
8078
coffee-rails (4.1.0)
8179
coffee-script (>= 2.2.0)
8280
railties (>= 4.0.0, < 5.0)
@@ -89,6 +87,9 @@ GEM
8987
debug_inspector (0.0.2)
9088
diff-lcs (1.2.5)
9189
erubis (2.7.0)
90+
es5-shim-rails (4.0.1)
91+
actionpack (>= 3.1)
92+
railties (>= 3.1)
9293
execjs (2.5.2)
9394
factory_girl (4.5.0)
9495
activesupport (>= 3.0.0)
@@ -128,6 +129,11 @@ GEM
128129
parser (2.2.2.6)
129130
ast (>= 1.1, < 3.0)
130131
pg (0.18.2)
132+
poltergeist (1.6.0)
133+
capybara (~> 2.1)
134+
cliver (~> 0.3.1)
135+
multi_json (~> 1.0)
136+
websocket-driver (>= 0.2.0)
131137
powerpack (0.1.1)
132138
rack (1.6.4)
133139
rack-test (0.6.3)
@@ -242,6 +248,9 @@ GEM
242248
binding_of_caller (>= 0.7.2)
243249
railties (>= 4.0)
244250
sprockets-rails (>= 2.0, < 4.0)
251+
websocket-driver (0.6.2)
252+
websocket-extensions (>= 0.1.0)
253+
websocket-extensions (0.1.2)
245254
xpath (2.0.0)
246255
nokogiri (~> 1.3)
247256

@@ -256,15 +265,16 @@ DEPENDENCIES
256265
byebug
257266
capybara
258267
capybara-screenshot
259-
capybara-webkit
260268
coffee-rails
261269
database_cleaner
270+
es5-shim-rails
262271
factory_girl_rails
263272
foreman
264273
jbuilder
265274
jquery-rails
266275
launchy
267276
pg
277+
poltergeist
268278
rails (~> 4.2)
269279
rails-html-sanitizer
270280
rails_12factor
@@ -284,4 +294,4 @@ DEPENDENCIES
284294
web-console
285295

286296
BUNDLED WITH
287-
1.10.5
297+
1.10.6

app/assets/javascripts/application.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717

1818
// Important to import jquery_ujs before rails-bundle as that patches jquery xhr to use the authenticity token!
1919

20+
//= require es5-shim/es5-shim
2021
//= require generated/client-bundle
2122
//= require turbolinks

db/schema.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
ActiveRecord::Schema.define(version: 20140823052830) do
1515

16-
create_table "comments", force: true do |t|
16+
create_table "comments", force: :cascade do |t|
1717
t.string "author"
1818
t.text "text"
1919
t.datetime "created_at", null: false

spec/rails_helper.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
require File.expand_path("../../config/environment", __FILE__)
55
require "rspec/rails"
66
require "capybara/rspec"
7+
require "capybara/poltergeist"
78
require "capybara-screenshot/rspec"
89
# Add additional requires below this line. Rails is not loaded until this point!
910

@@ -47,7 +48,8 @@
4748
DatabaseCleaner.clean
4849
end
4950

50-
Capybara.javascript_driver = :webkit
51+
52+
Capybara.javascript_driver = :poltergeist
5153

5254
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
5355
config.fixture_path = "#{::Rails.root}/spec/fixtures"

0 commit comments

Comments
 (0)