Skip to content

Commit e35397a

Browse files
committedOct 5, 2016
update for Ruby 2.3.1 and Rails 4.2.7.1
1 parent a4ecf23 commit e35397a

File tree

7 files changed

+134
-143
lines changed

7 files changed

+134
-143
lines changed
 

‎.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.3
1+
2.3.1

‎Gemfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
2-
ruby '2.2.3'
3-
gem 'rails', '4.2.5'
2+
ruby '2.3.1'
3+
gem 'rails', '4.2.7.1'
44
gem 'sqlite3'
55
gem 'sass-rails', '~> 5.0'
66
gem 'uglifier', '>= 1.3.0'
@@ -22,7 +22,6 @@ gem 'simple_form'
2222
gem 'sucker_punch'
2323
group :development do
2424
gem 'better_errors'
25-
gem 'quiet_assets'
2625
gem 'rails_layout'
2726
gem 'spring-commands-rspec'
2827
end

‎Gemfile.lock

+115-131
Original file line numberDiff line numberDiff line change
@@ -1,228 +1,210 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.5)
5-
actionpack (= 4.2.5)
6-
actionview (= 4.2.5)
7-
activejob (= 4.2.5)
4+
actionmailer (4.2.7.1)
5+
actionpack (= 4.2.7.1)
6+
actionview (= 4.2.7.1)
7+
activejob (= 4.2.7.1)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.5)
11-
actionview (= 4.2.5)
12-
activesupport (= 4.2.5)
10+
actionpack (4.2.7.1)
11+
actionview (= 4.2.7.1)
12+
activesupport (= 4.2.7.1)
1313
rack (~> 1.6)
1414
rack-test (~> 0.6.2)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
1616
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.5)
18-
activesupport (= 4.2.5)
17+
actionview (4.2.7.1)
18+
activesupport (= 4.2.7.1)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
2222
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
activejob (4.2.5)
24-
activesupport (= 4.2.5)
23+
activejob (4.2.7.1)
24+
activesupport (= 4.2.7.1)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.5)
27-
activesupport (= 4.2.5)
26+
activemodel (4.2.7.1)
27+
activesupport (= 4.2.7.1)
2828
builder (~> 3.1)
29-
activerecord (4.2.5)
30-
activemodel (= 4.2.5)
31-
activesupport (= 4.2.5)
29+
activerecord (4.2.7.1)
30+
activemodel (= 4.2.7.1)
31+
activesupport (= 4.2.7.1)
3232
arel (~> 6.0)
33-
activesupport (4.2.5)
33+
activesupport (4.2.7.1)
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)
39-
addressable (2.3.8)
39+
addressable (2.4.0)
4040
arel (6.0.3)
41-
autoprefixer-rails (6.1.0.1)
41+
autoprefixer-rails (6.5.0.2)
4242
execjs
43-
json
4443
better_errors (2.1.1)
4544
coderay (>= 1.0.0)
4645
erubis (>= 2.6.6)
4746
rack (>= 0.9.0)
4847
binding_of_caller (0.7.2)
4948
debug_inspector (>= 0.0.1)
50-
bootstrap-sass (3.3.5.1)
51-
autoprefixer-rails (>= 5.0.0.1)
52-
sass (>= 3.3.0)
49+
bootstrap-sass (3.3.7)
50+
autoprefixer-rails (>= 5.2.1)
51+
sass (>= 3.3.4)
5352
builder (3.2.2)
54-
byebug (8.2.0)
55-
capybara (2.5.0)
53+
byebug (9.0.6)
54+
capybara (2.9.2)
55+
addressable
5656
mime-types (>= 1.16)
5757
nokogiri (>= 1.3.3)
5858
rack (>= 1.0.0)
5959
rack-test (>= 0.5.4)
6060
xpath (~> 2.0)
61-
celluloid (0.17.2)
62-
celluloid-essentials
63-
celluloid-extras
64-
celluloid-fsm
65-
celluloid-pool
66-
celluloid-supervision
67-
timers (>= 4.1.1)
68-
celluloid-essentials (0.20.5)
69-
timers (>= 4.1.1)
70-
celluloid-extras (0.20.5)
71-
timers (>= 4.1.1)
72-
celluloid-fsm (0.20.5)
73-
timers (>= 4.1.1)
74-
celluloid-pool (0.20.5)
75-
timers (>= 4.1.1)
76-
celluloid-supervision (0.20.5)
77-
timers (>= 4.1.1)
78-
childprocess (0.5.8)
61+
childprocess (0.5.9)
7962
ffi (~> 1.0, >= 1.0.11)
80-
coderay (1.1.0)
81-
coffee-rails (4.1.0)
63+
coderay (1.1.1)
64+
coffee-rails (4.1.1)
8265
coffee-script (>= 2.2.0)
83-
railties (>= 4.0.0, < 5.0)
66+
railties (>= 4.0.0, < 5.1.x)
8467
coffee-script (2.4.1)
8568
coffee-script-source
8669
execjs
8770
coffee-script-source (1.10.0)
88-
database_cleaner (1.5.1)
71+
concurrent-ruby (1.0.2)
72+
database_cleaner (1.5.3)
8973
debug_inspector (0.0.2)
9074
diff-lcs (1.2.5)
9175
erubis (2.7.0)
92-
execjs (2.6.0)
93-
factory_girl (4.5.0)
76+
execjs (2.7.0)
77+
factory_girl (4.7.0)
9478
activesupport (>= 3.0.0)
95-
factory_girl_rails (4.5.0)
96-
factory_girl (~> 4.5.0)
79+
factory_girl_rails (4.7.0)
80+
factory_girl (~> 4.7.0)
9781
railties (>= 3.0.0)
98-
faker (1.5.0)
82+
faker (1.6.6)
9983
i18n (~> 0.5)
10084
faraday (0.9.2)
10185
multipart-post (>= 1.2, < 3)
102-
ffi (1.9.10)
103-
gibbon (2.1.2)
86+
ffi (1.9.14)
87+
gibbon (2.2.4)
10488
faraday (>= 0.9.1)
10589
multi_json (>= 1.11.0)
106-
globalid (0.3.6)
90+
globalid (0.3.7)
10791
activesupport (>= 4.1.0)
108-
high_voltage (2.4.0)
109-
hitimes (1.2.3)
92+
high_voltage (3.0.0)
11093
i18n (0.7.0)
111-
jbuilder (2.3.2)
112-
activesupport (>= 3.0.0, < 5)
94+
jbuilder (2.6.0)
95+
activesupport (>= 3.0.0, < 5.1)
11396
multi_json (~> 1.2)
114-
jquery-rails (4.0.5)
115-
rails-dom-testing (~> 1.0)
97+
jquery-rails (4.2.1)
98+
rails-dom-testing (>= 1, < 3)
11699
railties (>= 4.2.0)
117100
thor (>= 0.14, < 2.0)
118101
json (1.8.3)
119102
launchy (2.4.3)
120103
addressable (~> 2.3)
121104
loofah (2.0.3)
122105
nokogiri (>= 1.5.9)
123-
mail (2.6.3)
124-
mime-types (>= 1.16, < 3)
125-
mime-types (2.6.2)
126-
mini_portile (0.6.2)
127-
minitest (5.8.2)
128-
multi_json (1.11.2)
106+
mail (2.6.4)
107+
mime-types (>= 1.16, < 4)
108+
mime-types (3.1)
109+
mime-types-data (~> 3.2015)
110+
mime-types-data (3.2016.0521)
111+
mini_portile2 (2.1.0)
112+
minitest (5.9.1)
113+
multi_json (1.12.1)
129114
multipart-post (2.0.0)
130-
nokogiri (1.6.6.3)
131-
mini_portile (~> 0.6.0)
132-
quiet_assets (1.1.0)
133-
railties (>= 3.1, < 5.0)
115+
nokogiri (1.6.8.1)
116+
mini_portile2 (~> 2.1.0)
134117
rack (1.6.4)
135118
rack-test (0.6.3)
136119
rack (>= 1.0)
137-
rails (4.2.5)
138-
actionmailer (= 4.2.5)
139-
actionpack (= 4.2.5)
140-
actionview (= 4.2.5)
141-
activejob (= 4.2.5)
142-
activemodel (= 4.2.5)
143-
activerecord (= 4.2.5)
144-
activesupport (= 4.2.5)
120+
rails (4.2.7.1)
121+
actionmailer (= 4.2.7.1)
122+
actionpack (= 4.2.7.1)
123+
actionview (= 4.2.7.1)
124+
activejob (= 4.2.7.1)
125+
activemodel (= 4.2.7.1)
126+
activerecord (= 4.2.7.1)
127+
activesupport (= 4.2.7.1)
145128
bundler (>= 1.3.0, < 2.0)
146-
railties (= 4.2.5)
129+
railties (= 4.2.7.1)
147130
sprockets-rails
148131
rails-deprecated_sanitizer (1.0.3)
149132
activesupport (>= 4.2.0.alpha)
150133
rails-dom-testing (1.0.7)
151134
activesupport (>= 4.2.0.beta, < 5.0)
152135
nokogiri (~> 1.6.0)
153136
rails-deprecated_sanitizer (>= 1.0.1)
154-
rails-html-sanitizer (1.0.2)
137+
rails-html-sanitizer (1.0.3)
155138
loofah (~> 2.0)
156-
rails_layout (1.0.28)
157-
railties (4.2.5)
158-
actionpack (= 4.2.5)
159-
activesupport (= 4.2.5)
139+
rails_layout (1.0.31)
140+
railties (4.2.7.1)
141+
actionpack (= 4.2.7.1)
142+
activesupport (= 4.2.7.1)
160143
rake (>= 0.8.7)
161144
thor (>= 0.18.1, < 2.0)
162-
rake (10.4.2)
163-
rspec-core (3.4.0)
164-
rspec-support (~> 3.4.0)
165-
rspec-expectations (3.4.0)
145+
rake (11.3.0)
146+
rspec-core (3.5.4)
147+
rspec-support (~> 3.5.0)
148+
rspec-expectations (3.5.0)
166149
diff-lcs (>= 1.2.0, < 2.0)
167-
rspec-support (~> 3.4.0)
168-
rspec-mocks (3.4.0)
150+
rspec-support (~> 3.5.0)
151+
rspec-mocks (3.5.0)
169152
diff-lcs (>= 1.2.0, < 2.0)
170-
rspec-support (~> 3.4.0)
171-
rspec-rails (3.4.0)
172-
actionpack (>= 3.0, < 4.3)
173-
activesupport (>= 3.0, < 4.3)
174-
railties (>= 3.0, < 4.3)
175-
rspec-core (~> 3.4.0)
176-
rspec-expectations (~> 3.4.0)
177-
rspec-mocks (~> 3.4.0)
178-
rspec-support (~> 3.4.0)
179-
rspec-support (3.4.0)
180-
rubyzip (1.1.7)
181-
sass (3.4.19)
182-
sass-rails (5.0.4)
183-
railties (>= 4.0.0, < 5.0)
153+
rspec-support (~> 3.5.0)
154+
rspec-rails (3.5.2)
155+
actionpack (>= 3.0)
156+
activesupport (>= 3.0)
157+
railties (>= 3.0)
158+
rspec-core (~> 3.5.0)
159+
rspec-expectations (~> 3.5.0)
160+
rspec-mocks (~> 3.5.0)
161+
rspec-support (~> 3.5.0)
162+
rspec-support (3.5.0)
163+
rubyzip (1.2.0)
164+
sass (3.4.22)
165+
sass-rails (5.0.6)
166+
railties (>= 4.0.0, < 6)
184167
sass (~> 3.1)
185168
sprockets (>= 2.8, < 4.0)
186169
sprockets-rails (>= 2.0, < 4.0)
187170
tilt (>= 1.1, < 3)
188-
selenium-webdriver (2.48.1)
171+
selenium-webdriver (2.53.4)
189172
childprocess (~> 0.5)
190-
multi_json (~> 1.0)
191173
rubyzip (~> 1.0)
192174
websocket (~> 1.0)
193-
simple_form (3.2.0)
194-
actionpack (~> 4.0)
195-
activemodel (~> 4.0)
196-
spring (1.4.3)
175+
simple_form (3.3.1)
176+
actionpack (> 4, < 5.1)
177+
activemodel (> 4, < 5.1)
178+
spring (2.0.0)
179+
activesupport (>= 4.2)
197180
spring-commands-rspec (1.0.4)
198181
spring (>= 0.9.1)
199-
sprockets (3.4.0)
182+
sprockets (3.7.0)
183+
concurrent-ruby (~> 1.0)
200184
rack (> 1, < 3)
201-
sprockets-rails (2.3.3)
202-
actionpack (>= 3.0)
203-
activesupport (>= 3.0)
204-
sprockets (>= 2.8, < 4.0)
185+
sprockets-rails (3.2.0)
186+
actionpack (>= 4.0)
187+
activesupport (>= 4.0)
188+
sprockets (>= 3.0.0)
205189
sqlite3 (1.3.11)
206-
sucker_punch (1.6.0)
207-
celluloid (~> 0.17.2)
190+
sucker_punch (2.0.2)
191+
concurrent-ruby (~> 1.0.0)
208192
thor (0.19.1)
209193
thread_safe (0.3.5)
210-
tilt (2.0.1)
211-
timers (4.1.1)
212-
hitimes
213-
turbolinks (2.5.3)
214-
coffee-rails
194+
tilt (2.0.5)
195+
turbolinks (5.0.1)
196+
turbolinks-source (~> 5)
197+
turbolinks-source (5.0.0)
215198
tzinfo (1.2.2)
216199
thread_safe (~> 0.1)
217-
uglifier (2.7.2)
218-
execjs (>= 0.3.0)
219-
json (>= 1.8.0)
220-
web-console (2.2.1)
200+
uglifier (3.0.2)
201+
execjs (>= 0.3.0, < 3)
202+
web-console (2.3.0)
221203
activemodel (>= 4.0)
222204
binding_of_caller (>= 0.7.2)
223205
railties (>= 4.0)
224206
sprockets-rails (>= 2.0, < 4.0)
225-
websocket (1.2.2)
207+
websocket (1.2.3)
226208
xpath (2.0.0)
227209
nokogiri (~> 1.3)
228210

@@ -243,8 +225,7 @@ DEPENDENCIES
243225
jbuilder (~> 2.0)
244226
jquery-rails
245227
launchy
246-
quiet_assets
247-
rails (= 4.2.5)
228+
rails (= 4.2.7.1)
248229
rails_layout
249230
rspec-rails
250231
sass-rails (~> 5.0)
@@ -258,5 +239,8 @@ DEPENDENCIES
258239
uglifier (>= 1.3.0)
259240
web-console (~> 2.0)
260241

242+
RUBY VERSION
243+
ruby 2.3.1p112
244+
261245
BUNDLED WITH
262-
1.10.6
246+
1.13.2

‎app/views/layouts/_messages.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%# Rails flash messages styled for Bootstrap 3.0 %>
22
<% flash.each do |name, msg| %>
33
<% if msg.is_a?(String) %>
4-
<div class="alert alert-<%= name.to_s == 'notice' ? 'success' : 'danger' %>">
4+
<div class="alert alert-dismissible alert-<%= name.to_s == 'notice' ? 'success' : 'danger' %>">
55
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
66
<%= content_tag :div, msg, :id => "flash_#{name}" %>
77
</div>

‎config/initializers/sucker_punch.rb

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Sucker Punch version 2.0.0+ backwards compatibility with Rails < 5.0.0
2+
require 'sucker_punch/async_syntax'

‎spec/factories/visitors.rb

-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
factory :visitor do
33
email "MyString"
44
end
5-
65
end

‎spec/spec_helper.rb

+13-6
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,22 @@
4040
mocks.verify_partial_doubles = true
4141
end
4242

43+
# This option will default to `:apply_to_host_groups` in RSpec 4 (and will
44+
# have no way to turn it off -- the option exists only for backwards
45+
# compatibility in RSpec 3). It causes shared context metadata to be
46+
# inherited by the metadata hash of host groups and examples, rather than
47+
# triggering implicit auto-inclusion in groups with matching metadata.
48+
config.shared_context_metadata_behavior = :apply_to_host_groups
49+
4350
# The settings below are suggested to provide a good initial experience
4451
# with RSpec, but feel free to customize to your heart's content.
4552
=begin
46-
# These two settings work together to allow you to limit a spec run
47-
# to individual examples or groups you care about by tagging them with
48-
# `:focus` metadata. When nothing is tagged with `:focus`, all examples
49-
# get run.
50-
config.filter_run :focus
51-
config.run_all_when_everything_filtered = true
53+
# This allows you to limit a spec run to individual examples or groups
54+
# you care about by tagging them with `:focus` metadata. When nothing
55+
# is tagged with `:focus`, all examples get run. RSpec also provides
56+
# aliases for `it`, `describe`, and `context` that include `:focus`
57+
# metadata: `fit`, `fdescribe` and `fcontext`, respectively.
58+
config.filter_run_when_matching :focus
5259
5360
# Allows RSpec to persist some state between runs in order to support
5461
# the `--only-failures` and `--next-failure` CLI options. We recommend

0 commit comments

Comments
 (0)
Please sign in to comment.