Skip to content

Commit 07950bd

Browse files
justin808justin808
committed
Merge branch 'update-gems-npm'
* update-gems-npm: 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. Updated version of node in enginees section Updated README.md Added jscs linting support Update versions of ruby, node, gems, npm
2 parents 8376641 + ea00715 commit 07950bd

27 files changed

+698
-856
lines changed

‎.nvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.12.7

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.1
1+
2.2.2

‎Gemfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source "https://rubygems.org"
2-
ruby "2.2.1"
2+
ruby "2.2.2"
33

44
#
55
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
@@ -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"
@@ -49,7 +50,7 @@ group :development, :test do
4950
gem "byebug"
5051

5152
# Access an IRB console on exceptions page and /console in development
52-
gem "web-console", "~> 2.0.0.beta2"
53+
gem "web-console"
5354

5455
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
5556
gem "spring"
@@ -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: 91 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.1)
5-
actionpack (= 4.2.1)
6-
actionview (= 4.2.1)
7-
activejob (= 4.2.1)
4+
actionmailer (4.2.3)
5+
actionpack (= 4.2.3)
6+
actionview (= 4.2.3)
7+
activejob (= 4.2.3)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.1)
11-
actionview (= 4.2.1)
12-
activesupport (= 4.2.1)
10+
actionpack (4.2.3)
11+
actionview (= 4.2.3)
12+
activesupport (= 4.2.3)
1313
rack (~> 1.6)
1414
rack-test (~> 0.6.2)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
16-
rails-html-sanitizer (~> 1.0, >= 1.0.1)
17-
actionview (4.2.1)
18-
activesupport (= 4.2.1)
16+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17+
actionview (4.2.3)
18+
activesupport (= 4.2.3)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
22-
rails-html-sanitizer (~> 1.0, >= 1.0.1)
23-
activejob (4.2.1)
24-
activesupport (= 4.2.1)
22+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23+
activejob (4.2.3)
24+
activesupport (= 4.2.3)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.1)
27-
activesupport (= 4.2.1)
26+
activemodel (4.2.3)
27+
activesupport (= 4.2.3)
2828
builder (~> 3.1)
29-
activerecord (4.2.1)
30-
activemodel (= 4.2.1)
31-
activesupport (= 4.2.1)
29+
activerecord (4.2.3)
30+
activemodel (= 4.2.3)
31+
activesupport (= 4.2.3)
3232
arel (~> 6.0)
33-
activesupport (4.2.1)
33+
activesupport (4.2.3)
3434
i18n (~> 0.7)
3535
json (~> 1.7, >= 1.7.7)
3636
minitest (~> 5.1)
3737
thread_safe (~> 0.3, >= 0.3.4)
3838
tzinfo (~> 1.1)
3939
addressable (2.3.8)
40-
arel (6.0.0)
40+
arel (6.0.2)
4141
ast (2.0.0)
42-
astrolabe (1.3.0)
43-
parser (>= 2.2.0.pre.3, < 3.0)
44-
autoprefixer-rails (5.1.11)
42+
astrolabe (1.3.1)
43+
parser (~> 2.2)
44+
autoprefixer-rails (5.2.1.1)
4545
execjs
4646
json
4747
binding_of_caller (0.7.2)
4848
debug_inspector (>= 0.0.1)
49-
bootstrap-sass (3.3.4.1)
49+
bootstrap-sass (3.3.5.1)
5050
autoprefixer-rails (>= 5.0.0.1)
51-
sass (>= 3.2.19)
52-
brakeman (3.0.3)
51+
sass (>= 3.3.0)
52+
brakeman (3.0.5)
5353
erubis (~> 2.6)
5454
fastercsv (~> 1.5)
5555
haml (>= 3.0, < 5.0)
5656
highline (~> 1.6.20)
5757
multi_json (~> 1.2)
5858
ruby2ruby (~> 2.1.1)
59-
ruby_parser (~> 3.6.2)
59+
ruby_parser (~> 3.7.0)
6060
sass (~> 3.0)
6161
terminal-table (~> 1.4)
6262
builder (3.2.2)
63-
bundler-audit (0.3.1)
63+
bundler-audit (0.4.0)
6464
bundler (~> 1.2)
6565
thor (~> 0.18)
6666
byebug (5.0.0)
@@ -71,12 +71,10 @@ GEM
7171
rack (>= 1.0.0)
7272
rack-test (>= 0.5.4)
7373
xpath (~> 2.0)
74-
capybara-screenshot (1.0.9)
74+
capybara-screenshot (1.0.11)
7575
capybara (>= 1.0, < 3)
7676
launchy
77-
capybara-webkit (1.5.1)
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)
@@ -104,44 +105,49 @@ GEM
104105
tilt
105106
highline (1.6.21)
106107
i18n (0.7.0)
107-
jbuilder (2.2.16)
108+
jbuilder (2.3.1)
108109
activesupport (>= 3.0.0, < 5)
109110
multi_json (~> 1.2)
110-
jquery-rails (4.0.3)
111+
jquery-rails (4.0.4)
111112
rails-dom-testing (~> 1.0)
112113
railties (>= 4.2.0)
113114
thor (>= 0.14, < 2.0)
114-
json (1.8.2)
115+
json (1.8.3)
115116
kgio (2.9.3)
116117
launchy (2.4.3)
117118
addressable (~> 2.3)
118119
loofah (2.0.2)
119120
nokogiri (>= 1.5.9)
120121
mail (2.6.3)
121122
mime-types (>= 1.16, < 3)
122-
mime-types (2.5)
123+
mime-types (2.6.1)
123124
mini_portile (0.6.2)
124-
minitest (5.6.1)
125-
multi_json (1.11.0)
125+
minitest (5.7.0)
126+
multi_json (1.11.2)
126127
nokogiri (1.6.6.2)
127128
mini_portile (~> 0.6.0)
128-
parser (2.2.2.3)
129+
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)
132-
rack (1.6.1)
138+
rack (1.6.4)
133139
rack-test (0.6.3)
134140
rack (>= 1.0)
135-
rails (4.2.1)
136-
actionmailer (= 4.2.1)
137-
actionpack (= 4.2.1)
138-
actionview (= 4.2.1)
139-
activejob (= 4.2.1)
140-
activemodel (= 4.2.1)
141-
activerecord (= 4.2.1)
142-
activesupport (= 4.2.1)
141+
rails (4.2.3)
142+
actionmailer (= 4.2.3)
143+
actionpack (= 4.2.3)
144+
actionview (= 4.2.3)
145+
activejob (= 4.2.3)
146+
activemodel (= 4.2.3)
147+
activerecord (= 4.2.3)
148+
activesupport (= 4.2.3)
143149
bundler (>= 1.3.0, < 2.0)
144-
railties (= 4.2.1)
150+
railties (= 4.2.3)
145151
sprockets-rails
146152
rails-deprecated_sanitizer (1.0.3)
147153
activesupport (>= 4.2.0.alpha)
@@ -156,36 +162,35 @@ GEM
156162
rails_stdout_logging
157163
rails_serve_static_assets (0.0.4)
158164
rails_stdout_logging (0.0.3)
159-
railties (4.2.1)
160-
actionpack (= 4.2.1)
161-
activesupport (= 4.2.1)
165+
railties (4.2.3)
166+
actionpack (= 4.2.3)
167+
activesupport (= 4.2.3)
162168
rake (>= 0.8.7)
163169
thor (>= 0.18.1, < 2.0)
164170
rainbow (2.0.0)
165-
raindrops (0.13.0)
171+
raindrops (0.15.0)
166172
rake (10.4.2)
167173
rdoc (4.2.0)
168-
json (~> 1.4)
169-
rspec-core (3.2.3)
170-
rspec-support (~> 3.2.0)
171-
rspec-expectations (3.2.1)
174+
rspec-core (3.3.2)
175+
rspec-support (~> 3.3.0)
176+
rspec-expectations (3.3.1)
172177
diff-lcs (>= 1.2.0, < 2.0)
173-
rspec-support (~> 3.2.0)
174-
rspec-mocks (3.2.1)
178+
rspec-support (~> 3.3.0)
179+
rspec-mocks (3.3.2)
175180
diff-lcs (>= 1.2.0, < 2.0)
176-
rspec-support (~> 3.2.0)
177-
rspec-rails (3.2.1)
181+
rspec-support (~> 3.3.0)
182+
rspec-rails (3.3.3)
178183
actionpack (>= 3.0, < 4.3)
179184
activesupport (>= 3.0, < 4.3)
180185
railties (>= 3.0, < 4.3)
181-
rspec-core (~> 3.2.0)
182-
rspec-expectations (~> 3.2.0)
183-
rspec-mocks (~> 3.2.0)
184-
rspec-support (~> 3.2.0)
185-
rspec-support (3.2.2)
186-
rubocop (0.31.0)
186+
rspec-core (~> 3.3.0)
187+
rspec-expectations (~> 3.3.0)
188+
rspec-mocks (~> 3.3.0)
189+
rspec-support (~> 3.3.0)
190+
rspec-support (3.3.0)
191+
rubocop (0.32.1)
187192
astrolabe (~> 1.3)
188-
parser (>= 2.2.2.1, < 3.0)
193+
parser (>= 2.2.2.5, < 3.0)
189194
powerpack (~> 0.1)
190195
rainbow (>= 1.99.1, < 3.0)
191196
ruby-progressbar (~> 1.4)
@@ -196,9 +201,9 @@ GEM
196201
ruby2ruby (2.1.4)
197202
ruby_parser (~> 3.1)
198203
sexp_processor (~> 4.0)
199-
ruby_parser (3.6.6)
204+
ruby_parser (3.7.0)
200205
sexp_processor (~> 4.1)
201-
sass (3.4.13)
206+
sass (3.4.16)
202207
sass-rails (5.0.3)
203208
railties (>= 4.0.0, < 5.0)
204209
sass (~> 3.1)
@@ -211,19 +216,19 @@ GEM
211216
sdoc (0.4.1)
212217
json (~> 1.7, >= 1.7.7)
213218
rdoc (~> 4.0)
214-
sexp_processor (4.5.1)
219+
sexp_processor (4.6.0)
215220
slop (3.6.0)
216221
spring (1.3.6)
217222
spring-commands-rspec (1.0.4)
218223
spring (>= 0.9.1)
219-
sprockets (3.1.0)
224+
sprockets (3.2.0)
220225
rack (~> 1.0)
221-
sprockets-rails (2.3.1)
226+
sprockets-rails (2.3.2)
222227
actionpack (>= 3.0)
223228
activesupport (>= 3.0)
224229
sprockets (>= 2.8, < 4.0)
225230
sqlite3 (1.3.10)
226-
terminal-table (1.4.5)
231+
terminal-table (1.5.2)
227232
thor (0.19.1)
228233
thread_safe (0.3.5)
229234
tilt (1.4.1)
@@ -238,11 +243,14 @@ GEM
238243
kgio (~> 2.6)
239244
rack
240245
raindrops (~> 0.7)
241-
web-console (2.0.0)
242-
activemodel (~> 4.0)
246+
web-console (2.2.1)
247+
activemodel (>= 4.0)
243248
binding_of_caller (>= 0.7.2)
244-
railties (~> 4.0)
249+
railties (>= 4.0)
245250
sprockets-rails (>= 2.0, < 4.0)
251+
websocket-driver (0.6.2)
252+
websocket-extensions (>= 0.1.0)
253+
websocket-extensions (0.1.2)
246254
xpath (2.0.0)
247255
nokogiri (~> 1.3)
248256

@@ -257,15 +265,16 @@ DEPENDENCIES
257265
byebug
258266
capybara
259267
capybara-screenshot
260-
capybara-webkit
261268
coffee-rails
262269
database_cleaner
270+
es5-shim-rails
263271
factory_girl_rails
264272
foreman
265273
jbuilder
266274
jquery-rails
267275
launchy
268276
pg
277+
poltergeist
269278
rails (~> 4.2)
270279
rails-html-sanitizer
271280
rails_12factor
@@ -282,4 +291,7 @@ DEPENDENCIES
282291
turbolinks
283292
uglifier
284293
unicorn
285-
web-console (~> 2.0.0.beta2)
294+
web-console
295+
296+
BUNDLED WITH
297+
1.10.6

0 commit comments

Comments
 (0)