Skip to content

Commit bfc07e1

Browse files
committed
Merge pull request #79 from leesmith/74-upgrade-rspec
Bundle update gems (closes #74)
2 parents 60ae0c4 + ce49920 commit bfc07e1

File tree

1 file changed

+38
-41
lines changed

1 file changed

+38
-41
lines changed

Gemfile.lock

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,36 @@ GEM
3838
tzinfo (~> 1.1)
3939
addressable (2.3.8)
4040
arel (6.0.2)
41-
bcrypt (3.1.9)
41+
bcrypt (3.1.10)
4242
binding_of_caller (0.7.2)
4343
debug_inspector (>= 0.0.1)
4444
builder (3.2.2)
45-
byebug (3.5.1)
46-
columnize (~> 0.8)
47-
debugger-linecache (~> 1.2)
48-
slop (~> 3.6)
45+
byebug (5.0.0)
46+
columnize (= 0.9.0)
4947
capybara (2.4.4)
5048
mime-types (>= 1.16)
5149
nokogiri (>= 1.3.3)
5250
rack (>= 1.0.0)
5351
rack-test (>= 0.5.4)
5452
xpath (~> 2.0)
55-
childprocess (0.5.5)
53+
childprocess (0.5.6)
5654
ffi (~> 1.0, >= 1.0.11)
5755
cliver (0.3.2)
5856
coderay (1.1.0)
5957
coffee-rails (4.1.0)
6058
coffee-script (>= 2.2.0)
6159
railties (>= 4.0.0, < 5.0)
62-
coffee-script (2.3.0)
60+
coffee-script (2.4.1)
6361
coffee-script-source
6462
execjs
65-
coffee-script-source (1.8.0)
63+
coffee-script-source (1.9.1.1)
6664
columnize (0.9.0)
6765
cookiejar (0.3.2)
6866
crack (0.4.2)
6967
safe_yaml (~> 1.0.0)
70-
database_cleaner (1.3.0)
68+
database_cleaner (1.4.1)
7169
debug_inspector (0.0.2)
72-
debugger-linecache (1.2.0)
73-
devise (3.4.1)
70+
devise (3.5.1)
7471
bcrypt (~> 3.0)
7572
orm_adapter (~> 0.1)
7673
railties (>= 3.2.6, < 5)
@@ -94,22 +91,22 @@ GEM
9491
erubis (2.7.0)
9592
eventmachine (1.0.7)
9693
eventmachine_httpserver (0.2.1)
97-
execjs (2.2.2)
94+
execjs (2.5.2)
9895
factory_girl (4.5.0)
9996
activesupport (>= 3.0.0)
10097
factory_girl_rails (4.5.0)
10198
factory_girl (~> 4.5.0)
10299
railties (>= 3.0.0)
103-
ffi (1.9.6)
100+
ffi (1.9.10)
104101
globalid (0.3.5)
105102
activesupport (>= 4.1.0)
106103
hike (1.2.3)
107104
http_parser.rb (0.6.0)
108105
i18n (0.7.0)
109106
interception (0.5)
110-
jquery-rails (4.0.0)
107+
jquery-rails (4.0.4)
111108
rails-dom-testing (~> 1.0)
112-
railties (>= 4.2.0.beta, < 5.0)
109+
railties (>= 4.2.0)
113110
thor (>= 0.14, < 2.0)
114111
json (1.8.3)
115112
launchy (2.4.3)
@@ -135,12 +132,12 @@ GEM
135132
coderay (~> 1.1.0)
136133
method_source (~> 0.8.1)
137134
slop (~> 3.4)
138-
pry-rails (0.3.3)
135+
pry-rails (0.3.4)
139136
pry (>= 0.9.10)
140-
pry-rescue (1.4.1)
137+
pry-rescue (1.4.2)
141138
interception (>= 0.5)
142139
pry
143-
pry-stack_explorer (0.4.9.1)
140+
pry-stack_explorer (0.4.9.2)
144141
binding_of_caller (>= 0.7)
145142
pry (>= 0.9.11)
146143
puffing-billy (0.5.1)
@@ -179,25 +176,25 @@ GEM
179176
rake (>= 0.8.7)
180177
thor (>= 0.18.1, < 2.0)
181178
rake (10.4.2)
182-
responders (2.0.2)
183-
railties (>= 4.2.0.alpha, < 5)
184-
rspec-core (3.2.3)
185-
rspec-support (~> 3.2.0)
186-
rspec-expectations (3.2.1)
179+
responders (2.1.0)
180+
railties (>= 4.2.0, < 5)
181+
rspec-core (3.3.2)
182+
rspec-support (~> 3.3.0)
183+
rspec-expectations (3.3.1)
187184
diff-lcs (>= 1.2.0, < 2.0)
188-
rspec-support (~> 3.2.0)
189-
rspec-mocks (3.2.1)
185+
rspec-support (~> 3.3.0)
186+
rspec-mocks (3.3.2)
190187
diff-lcs (>= 1.2.0, < 2.0)
191-
rspec-support (~> 3.2.0)
192-
rspec-rails (3.2.1)
188+
rspec-support (~> 3.3.0)
189+
rspec-rails (3.3.3)
193190
actionpack (>= 3.0, < 4.3)
194191
activesupport (>= 3.0, < 4.3)
195192
railties (>= 3.0, < 4.3)
196-
rspec-core (~> 3.2.0)
197-
rspec-expectations (~> 3.2.0)
198-
rspec-mocks (~> 3.2.0)
199-
rspec-support (~> 3.2.0)
200-
rspec-support (3.2.2)
193+
rspec-core (~> 3.3.0)
194+
rspec-expectations (~> 3.3.0)
195+
rspec-mocks (~> 3.3.0)
196+
rspec-support (~> 3.3.0)
197+
rspec-support (3.3.0)
201198
rubyzip (1.1.7)
202199
safe_yaml (1.0.4)
203200
sass (3.2.19)
@@ -206,15 +203,15 @@ GEM
206203
sass (~> 3.2.2)
207204
sprockets (~> 2.8, < 3.0)
208205
sprockets-rails (~> 2.0)
209-
selenium-webdriver (2.45.0)
206+
selenium-webdriver (2.46.2)
210207
childprocess (~> 0.5)
211208
multi_json (~> 1.0)
212209
rubyzip (~> 1.0)
213210
websocket (~> 1.0)
214211
shoulda-matchers (3.0.0.rc1)
215212
activesupport (>= 4.0.0)
216213
slop (3.6.0)
217-
spring (1.2.0)
214+
spring (1.3.6)
218215
spring-commands-rspec (1.0.4)
219216
spring (>= 0.9.1)
220217
sprockets (2.12.4)
@@ -234,22 +231,22 @@ GEM
234231
coffee-rails
235232
tzinfo (1.2.2)
236233
thread_safe (~> 0.1)
237-
uglifier (2.6.0)
234+
uglifier (2.7.1)
238235
execjs (>= 0.3.0)
239236
json (>= 1.8.0)
240237
vcr (2.9.3)
241238
warden (1.2.3)
242239
rack (>= 1.0)
243-
web-console (2.0.0)
244-
activemodel (~> 4.0)
240+
web-console (2.2.1)
241+
activemodel (>= 4.0)
245242
binding_of_caller (>= 0.7.2)
246-
railties (~> 4.0)
243+
railties (>= 4.0)
247244
sprockets-rails (>= 2.0, < 4.0)
248-
webmock (1.20.4)
245+
webmock (1.21.0)
249246
addressable (>= 2.3.6)
250247
crack (>= 0.3.2)
251-
websocket (1.2.1)
252-
websocket-driver (0.5.4)
248+
websocket (1.2.2)
249+
websocket-driver (0.6.2)
253250
websocket-extensions (>= 0.1.0)
254251
websocket-extensions (0.1.2)
255252
xpath (2.0.0)

0 commit comments

Comments
 (0)