File tree 7 files changed +9
-33
lines changed
7 files changed +9
-33
lines changed Original file line number Diff line number Diff line change 63
63
group :test do
64
64
gem 'capybara'
65
65
gem 'capybara-screenshot'
66
+ gem 'capybara-webkit'
66
67
gem 'database_cleaner'
67
68
gem 'launchy'
68
- gem 'selenium-webdriver'
69
69
end
Original file line number Diff line number Diff line change 60
60
capybara-screenshot (1.0.7 )
61
61
capybara (>= 1.0 , < 3 )
62
62
launchy
63
- childprocess (0.5.5 )
64
- ffi (~> 1.0 , >= 1.0.11 )
63
+ capybara-webkit (1.4.1 )
64
+ capybara (>= 2.3.0 , < 2.5.0 )
65
+ json
65
66
coffee-rails (4.1.0 )
66
67
coffee-script (>= 2.2.0 )
67
68
railties (>= 4.0.0 , < 5.0 )
82
83
factory_girl_rails (4.5.0 )
83
84
factory_girl (~> 4.5.0 )
84
85
railties (>= 3.0.0 )
85
- ffi (1.9.8 )
86
86
foreman (0.77.0 )
87
87
dotenv (~> 1.0.2 )
88
88
thor (~> 0.19.1 )
165
165
rspec-mocks (~> 3.2.0 )
166
166
rspec-support (~> 3.2.0 )
167
167
rspec-support (3.2.2 )
168
- rubyzip (1.1.7 )
169
168
sass (3.4.11 )
170
169
sass-rails (5.0.1 )
171
170
railties (>= 4.0.0 , < 5.0 )
176
175
sdoc (0.4.1 )
177
176
json (~> 1.7 , >= 1.7.7 )
178
177
rdoc (~> 4.0 )
179
- selenium-webdriver (2.45.0 )
180
- childprocess (~> 0.5 )
181
- multi_json (~> 1.0 )
182
- rubyzip (~> 1.0 )
183
- websocket (~> 1.0 )
184
178
slop (3.6.0 )
185
179
spring (1.2.0 )
186
180
sprockets (2.12.3 )
212
206
binding_of_caller (>= 0.7.2 )
213
207
railties (~> 4.0 )
214
208
sprockets-rails (>= 2.0 , < 4.0 )
215
- websocket (1.2.1 )
216
209
xpath (2.0.0 )
217
210
nokogiri (~> 1.3 )
218
211
@@ -225,6 +218,7 @@ DEPENDENCIES
225
218
byebug
226
219
capybara
227
220
capybara-screenshot
221
+ capybara-webkit
228
222
coffee-rails
229
223
database_cleaner
230
224
factory_girl_rails
@@ -239,7 +233,6 @@ DEPENDENCIES
239
233
rspec-rails
240
234
sass-rails
241
235
sdoc
242
- selenium-webdriver
243
236
spring
244
237
sqlite3
245
238
turbolinks
Original file line number Diff line number Diff line change 26
26
"babel-core" : " ^4.7.16" ,
27
27
"babel-loader" : " ^4.2.0" ,
28
28
"body-parser" : " ^1.12.2" ,
29
+ "es5-shim" : " ^4.1.0" ,
29
30
"imports-loader" : " ^0.6.3" ,
30
31
"jquery" : " ^2.1.3" ,
31
32
"loader-utils" : " ^0.2.6" ,
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 6
6
7
7
var config = require ( "./webpack.common.config" ) ;
8
8
9
- config . entry . push ( "./scripts/rails_only" ) ; // rails specific assets
10
9
config . output = { filename : "client-bundle.js" ,
11
10
path : "../app/assets/javascripts" } ;
12
11
config . externals = { jquery : "var jQuery" } ; // load jQuery from cdn or rails asset pipeline
@@ -23,6 +22,7 @@ module.exports = config;
23
22
var devBuild = ( typeof process . env [ "BUILDPACK_URL" ] ) === "undefined" ;
24
23
if ( devBuild ) {
25
24
console . log ( "Webpack dev build for Rails" ) ;
25
+ config . entry . push ( 'es5-shim' ) ; // rails specific assets
26
26
module . exports . devtool = "eval-source-map" ;
27
27
} else {
28
28
console . log ( "Webpack production build for Rails" ) ;
Original file line number Diff line number Diff line change 48
48
DatabaseCleaner . clean
49
49
end
50
50
51
+ Capybara . javascript_driver = :webkit
52
+
51
53
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
52
54
config . fixture_path = "#{ ::Rails . root } /spec/fixtures"
53
55
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments