Skip to content

Commit 68e77f3

Browse files
committed
Update all gems and npm packages
Update mini-racer for Mac OS Sierra (#338) Updated linter to eslint-config-shakacode 13.0.0 Convert to latest react-bootstrap syntax fix scss lint Fixed a couple real bugs in the test and app code Tests passing locally with poltergeist.
1 parent c42e807 commit 68e77f3

32 files changed

+387
-5756
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ rvm:
44
- 2.3.1
55
sudo: false
66
addons:
7+
sauce_connect:
8+
username: "judahmeek"
9+
jwt:
10+
secure: "A/bVoePCHtwLGH4wVLCHK39+tml2axc/M/Mjnpg4m4bjgMI7GD4YqlnZMNrUBzNAv+Q66pp0sWjTy/Xm4tDaYnSxJFrWjD2wn5ZPpMEyB162nR+QqYqWl5DqP+jlOuIK+7iRmrRTlDS4LLTl43+nWxvRB16aat2U01P/+GKtQ+o="
711
apt:
812
sources:
913
- ubuntu-toolchain-r-test
@@ -15,6 +19,7 @@ env:
1519
global:
1620
- RAILS_ENV=test
1721
- CXX=g++-4.9
22+
- SAUCE_LABS_URL=http://judahmeek:[email protected]:80/wd/hub
1823
install:
1924
- bundle install
2025
- nvm install 6.3

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ group :test do
104104
gem "generator_spec"
105105
gem "launchy"
106106
gem "poltergeist"
107-
gem "rspec-rails", "3.5.0.beta3"
107+
gem "rspec-rails", "~> 3"
108108
gem "rspec-retry"
109-
gem "selenium-webdriver", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
109+
gem "selenium-webdriver", "<3.0.0", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
110110
end

Gemfile.lock

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,68 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.0.0)
5-
actionpack (= 5.0.0)
4+
actioncable (5.0.0.1)
5+
actionpack (= 5.0.0.1)
66
nio4r (~> 1.2)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.0.0)
9-
actionpack (= 5.0.0)
10-
actionview (= 5.0.0)
11-
activejob (= 5.0.0)
8+
actionmailer (5.0.0.1)
9+
actionpack (= 5.0.0.1)
10+
actionview (= 5.0.0.1)
11+
activejob (= 5.0.0.1)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.0.0)
15-
actionview (= 5.0.0)
16-
activesupport (= 5.0.0)
14+
actionpack (5.0.0.1)
15+
actionview (= 5.0.0.1)
16+
activesupport (= 5.0.0.1)
1717
rack (~> 2.0)
1818
rack-test (~> 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.0.0)
22-
activesupport (= 5.0.0)
21+
actionview (5.0.0.1)
22+
activesupport (= 5.0.0.1)
2323
builder (~> 3.1)
2424
erubis (~> 2.7.0)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.2)
27-
activejob (5.0.0)
28-
activesupport (= 5.0.0)
27+
activejob (5.0.0.1)
28+
activesupport (= 5.0.0.1)
2929
globalid (>= 0.3.6)
30-
activemodel (5.0.0)
31-
activesupport (= 5.0.0)
32-
activerecord (5.0.0)
33-
activemodel (= 5.0.0)
34-
activesupport (= 5.0.0)
30+
activemodel (5.0.0.1)
31+
activesupport (= 5.0.0.1)
32+
activerecord (5.0.0.1)
33+
activemodel (= 5.0.0.1)
34+
activesupport (= 5.0.0.1)
3535
arel (~> 7.0)
36-
activesupport (5.0.0)
36+
activesupport (5.0.0.1)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (~> 0.7)
3939
minitest (~> 5.1)
4040
tzinfo (~> 1.1)
41-
addressable (2.4.0)
41+
addressable (2.5.0)
42+
public_suffix (~> 2.0, >= 2.0.2)
4243
archive-zip (0.7.0)
4344
io-like (~> 0.3.0)
44-
arel (7.1.1)
45+
arel (7.1.4)
4546
ast (2.3.0)
46-
autoprefixer-rails (6.4.0.1)
47+
autoprefixer-rails (6.5.3)
4748
execjs
4849
awesome_print (1.7.0)
4950
binding_of_caller (0.7.2)
5051
debug_inspector (>= 0.0.1)
51-
brakeman (3.3.3)
52+
brakeman (3.4.1)
5253
builder (3.2.2)
5354
bundler-audit (0.5.0)
5455
bundler (~> 1.2)
5556
thor (~> 0.18)
56-
byebug (9.0.5)
57+
byebug (9.0.6)
5758
capybara (2.7.1)
5859
addressable
5960
mime-types (>= 1.16)
6061
nokogiri (>= 1.3.3)
6162
rack (>= 1.0.0)
6263
rack-test (>= 0.5.4)
6364
xpath (~> 2.0)
64-
capybara-screenshot (1.0.13)
65+
capybara-screenshot (1.0.14)
6566
capybara (>= 1.0, < 3)
6667
launchy
6768
capybara-webkit (1.11.1)
@@ -82,7 +83,7 @@ GEM
8283
execjs
8384
coffee-script-source (1.10.0)
8485
concurrent-ruby (1.0.2)
85-
connection_pool (2.2.0)
86+
connection_pool (2.2.1)
8687
coveralls (0.8.15)
8788
json (>= 1.8, < 3)
8889
simplecov (~> 0.12.0)
@@ -133,17 +134,15 @@ GEM
133134
mini_portile2 (2.1.0)
134135
mini_racer (0.1.7)
135136
libv8 (~> 5.3)
136-
minitest (5.9.0)
137+
minitest (5.9.1)
137138
multi_json (1.12.1)
138139
nio4r (1.2.1)
139-
nokogiri (1.6.8)
140+
nokogiri (1.6.8.1)
140141
mini_portile2 (~> 2.1.0)
141-
pkg-config (~> 1.1.7)
142-
parser (2.3.1.2)
142+
parser (2.3.2.0)
143143
ast (~> 2.2)
144-
pg (0.18.4)
145-
pkg-config (1.1.7)
146-
poltergeist (1.10.0)
144+
pg (0.19.0)
145+
poltergeist (1.11.0)
147146
capybara (~> 2.1)
148147
cliver (~> 0.3.1)
149148
websocket-driver (>= 0.2.0)
@@ -152,7 +151,7 @@ GEM
152151
coderay (~> 1.1.0)
153152
method_source (~> 0.8.1)
154153
slop (~> 3.4)
155-
pry-byebug (3.4.0)
154+
pry-byebug (3.4.1)
156155
byebug (~> 9.0)
157156
pry (~> 0.10)
158157
pry-doc (0.9.0)
@@ -166,21 +165,22 @@ GEM
166165
pry-stack_explorer (0.4.9.2)
167166
binding_of_caller (>= 0.7)
168167
pry (>= 0.9.11)
169-
puma (3.6.0)
168+
public_suffix (2.0.4)
169+
puma (3.6.2)
170170
rack (2.0.1)
171171
rack-test (0.6.3)
172172
rack (>= 1.0)
173-
rails (5.0.0)
174-
actioncable (= 5.0.0)
175-
actionmailer (= 5.0.0)
176-
actionpack (= 5.0.0)
177-
actionview (= 5.0.0)
178-
activejob (= 5.0.0)
179-
activemodel (= 5.0.0)
180-
activerecord (= 5.0.0)
181-
activesupport (= 5.0.0)
173+
rails (5.0.0.1)
174+
actioncable (= 5.0.0.1)
175+
actionmailer (= 5.0.0.1)
176+
actionpack (= 5.0.0.1)
177+
actionview (= 5.0.0.1)
178+
activejob (= 5.0.0.1)
179+
activemodel (= 5.0.0.1)
180+
activerecord (= 5.0.0.1)
181+
activesupport (= 5.0.0.1)
182182
bundler (>= 1.3.0, < 2.0)
183-
railties (= 5.0.0)
183+
railties (= 5.0.0.1)
184184
sprockets-rails (>= 2.0.0)
185185
rails-dom-testing (2.0.1)
186186
activesupport (>= 4.2.0, < 6.0)
@@ -192,56 +192,55 @@ GEM
192192
rails_stdout_logging
193193
rails_serve_static_assets (0.0.5)
194194
rails_stdout_logging (0.0.5)
195-
railties (5.0.0)
196-
actionpack (= 5.0.0)
197-
activesupport (= 5.0.0)
195+
railties (5.0.0.1)
196+
actionpack (= 5.0.0.1)
197+
activesupport (= 5.0.0.1)
198198
method_source
199199
rake (>= 0.8.7)
200200
thor (>= 0.18.1, < 2.0)
201201
rainbow (2.1.0)
202-
rake (11.2.2)
203-
rb-fsevent (0.9.7)
202+
rake (11.3.0)
203+
rb-fsevent (0.9.8)
204204
rb-inotify (0.9.7)
205205
ffi (>= 0.5.0)
206-
rdoc (4.2.2)
207-
json (~> 1.4)
208-
react_on_rails (6.1.0)
206+
rdoc (4.3.0)
207+
react_on_rails (6.1.2)
209208
addressable
210209
connection_pool
211210
execjs (~> 2.5)
212211
foreman
213212
rails (>= 3.2)
214213
rainbow (~> 2.1)
215-
rspec-core (3.5.0.beta3)
216-
rspec-support (= 3.5.0.beta3)
217-
rspec-expectations (3.5.0.beta3)
214+
rspec-core (3.5.4)
215+
rspec-support (~> 3.5.0)
216+
rspec-expectations (3.5.0)
218217
diff-lcs (>= 1.2.0, < 2.0)
219-
rspec-support (= 3.5.0.beta3)
220-
rspec-mocks (3.5.0.beta3)
218+
rspec-support (~> 3.5.0)
219+
rspec-mocks (3.5.0)
221220
diff-lcs (>= 1.2.0, < 2.0)
222-
rspec-support (= 3.5.0.beta3)
223-
rspec-rails (3.5.0.beta3)
221+
rspec-support (~> 3.5.0)
222+
rspec-rails (3.5.2)
224223
actionpack (>= 3.0)
225224
activesupport (>= 3.0)
226225
railties (>= 3.0)
227-
rspec-core (= 3.5.0.beta3)
228-
rspec-expectations (= 3.5.0.beta3)
229-
rspec-mocks (= 3.5.0.beta3)
230-
rspec-support (= 3.5.0.beta3)
231-
rspec-retry (0.5.0)
232-
rspec-core (~> 3.3)
233-
rspec-support (3.5.0.beta3)
234-
rubocop (0.42.0)
226+
rspec-core (~> 3.5.0)
227+
rspec-expectations (~> 3.5.0)
228+
rspec-mocks (~> 3.5.0)
229+
rspec-support (~> 3.5.0)
230+
rspec-retry (0.5.2)
231+
rspec-core (> 3.3, < 3.6)
232+
rspec-support (3.5.0)
233+
rubocop (0.45.0)
235234
parser (>= 2.3.1.1, < 3.0)
236235
powerpack (~> 0.1)
237236
rainbow (>= 1.99.1, < 3.0)
238237
ruby-progressbar (~> 1.7)
239238
unicode-display_width (~> 1.0, >= 1.0.1)
240-
ruby-lint (2.3.0)
239+
ruby-lint (2.3.1)
241240
parser (~> 2.2)
242241
slop (~> 3.4, >= 3.4.7)
243242
ruby-progressbar (1.8.1)
244-
ruby_dep (1.4.0)
243+
ruby_dep (1.5.0)
245244
rubyzip (1.2.0)
246245
sass (3.4.22)
247246
sass-rails (5.0.6)
@@ -250,10 +249,10 @@ GEM
250249
sprockets (>= 2.8, < 4.0)
251250
sprockets-rails (>= 2.0, < 4.0)
252251
tilt (>= 1.1, < 3)
253-
scss_lint (0.49.0)
252+
scss_lint (0.50.3)
254253
rake (>= 0.9, < 12)
255254
sass (~> 3.4.20)
256-
sdoc (0.4.1)
255+
sdoc (0.4.2)
257256
json (~> 1.7, >= 1.7.7)
258257
rdoc (~> 4.0)
259258
selenium-webdriver (2.53.4)
@@ -266,29 +265,30 @@ GEM
266265
simplecov-html (~> 0.10.0)
267266
simplecov-html (0.10.0)
268267
slop (3.6.0)
269-
spring (1.7.2)
268+
spring (2.0.0)
269+
activesupport (>= 4.2)
270270
spring-commands-rspec (1.0.4)
271271
spring (>= 0.9.1)
272272
sprockets (3.7.0)
273273
concurrent-ruby (~> 1.0)
274274
rack (> 1, < 3)
275-
sprockets-rails (3.1.1)
275+
sprockets-rails (3.2.0)
276276
actionpack (>= 4.0)
277277
activesupport (>= 4.0)
278278
sprockets (>= 3.0.0)
279-
sqlite3 (1.3.11)
280-
term-ansicolor (1.3.2)
279+
sqlite3 (1.3.12)
280+
term-ansicolor (1.4.0)
281281
tins (~> 1.0)
282282
thor (0.19.1)
283283
thread_safe (0.3.5)
284284
tilt (2.0.5)
285285
tins (1.12.0)
286286
tzinfo (1.2.2)
287287
thread_safe (~> 0.1)
288-
uglifier (3.0.1)
288+
uglifier (3.0.3)
289289
execjs (>= 0.3.0, < 3)
290-
unicode-display_width (1.1.0)
291-
web-console (3.3.1)
290+
unicode-display_width (1.1.1)
291+
web-console (3.4.0)
292292
actionview (>= 5.0)
293293
activemodel (>= 5.0)
294294
debug_inspector
@@ -337,14 +337,14 @@ DEPENDENCIES
337337
rails_12factor
338338
rainbow
339339
react_on_rails (~> 6.1)
340-
rspec-rails (= 3.5.0.beta3)
340+
rspec-rails (~> 3)
341341
rspec-retry
342342
rubocop
343343
ruby-lint
344344
sass-rails
345345
scss_lint
346346
sdoc
347-
selenium-webdriver
347+
selenium-webdriver (< 3.0.0)
348348
spring
349349
spring-commands-rspec
350350
sqlite3

app/views/pages/_header.html.erb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
id: "git-commit-sha" %>
55
</p>
66
<ul>
7+
<li>
8+
<%= link_to "Can ShakaCode Help You?",
9+
"https://blog.shakacode.com/can-shakacode-help-you-4a5b1e5a8a63#.jex6tg9w9" %>
10+
</li>
11+
712
<li>
813
See the
914
<%= link_to "github.com/shakacode/react-webpack-rails-tutorial/README.md",

client/.eslintrc.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ env:
1616
mocha: true
1717

1818
rules:
19-
### Imports
20-
# Can't do next one because of alias in webpack
21-
import/no-unresolved: 0
2219
import/extensions: [2, { js: "never", jsx: "never" }]
2320

24-
# https://github.com/benmosher/eslint-plugin-import/issues/340
25-
import/no-extraneous-dependencies: 0
21+
# Good idea, but let's go to flow before fixing all these
22+
react/forbid-prop-types: 0
2623

27-
# https://github.com/eslint/eslint/issues/6876 SFC's marked as invalid
28-
new-cap: 0
24+
# arrow-parens:
25+
# - 0
26+
# - "as-needed"
27+
28+
settings:
29+
import/resolver:
30+
webpack:
31+
config: 'webpack.client.base.config.js'

0 commit comments

Comments
 (0)