Skip to content

Commit f3646f2

Browse files
committed
Upgrading Rspec-rails to use master due to rspec/rspec-rails#2086
Instructions from rails/rails#35417 (comment)
1 parent df7c79a commit f3646f2

File tree

3 files changed

+53
-29
lines changed

3 files changed

+53
-29
lines changed

Gemfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ gem 'activeadmin'
4040
group :development, :test do
4141
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
4242
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
43-
gem 'rspec-rails'
43+
gem 'rspec-rails', git: 'https://github.com/rspec/rspec-rails', branch: '4-0-dev'
44+
gem 'rspec-core', git: 'https://github.com/rspec/rspec-core'
45+
gem 'rspec-mocks', git: 'https://github.com/rspec/rspec-mocks'
46+
gem 'rspec-support', git: 'https://github.com/rspec/rspec-support'
47+
gem 'rspec-expectations', git: 'https://github.com/rspec/rspec-expectations'
4448
end
4549

4650
group :development do

Gemfile.lock

+48-18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,46 @@
1+
GIT
2+
remote: https://github.com/rspec/rspec-core
3+
revision: 77dbc84657c5dc45e07a7fe0f5b02b4caeb6c9ad
4+
specs:
5+
rspec-core (3.9.0.pre)
6+
rspec-support (= 3.9.0.pre)
7+
8+
GIT
9+
remote: https://github.com/rspec/rspec-expectations
10+
revision: 75f5cc9cab09fd0728bcf95e26d2c4b46f73c466
11+
specs:
12+
rspec-expectations (3.9.0.pre)
13+
diff-lcs (>= 1.2.0, < 2.0)
14+
rspec-support (= 3.9.0.pre)
15+
16+
GIT
17+
remote: https://github.com/rspec/rspec-mocks
18+
revision: 2aab10d3e7a9c1c500acd1e88a7a408670f8cc48
19+
specs:
20+
rspec-mocks (3.9.0.pre)
21+
diff-lcs (>= 1.2.0, < 2.0)
22+
rspec-support (= 3.9.0.pre)
23+
24+
GIT
25+
remote: https://github.com/rspec/rspec-rails
26+
revision: 9c6d8f3eaa8049f940691b9489e7a7862cd912b0
27+
branch: 4-0-dev
28+
specs:
29+
rspec-rails (4.0.0.beta2)
30+
actionpack (>= 4.2)
31+
activesupport (>= 4.2)
32+
railties (>= 4.2)
33+
rspec-core (~> 3.8)
34+
rspec-expectations (~> 3.8)
35+
rspec-mocks (~> 3.8)
36+
rspec-support (~> 3.8)
37+
38+
GIT
39+
remote: https://github.com/rspec/rspec-support
40+
revision: c69a231d7369dd165ad7ce4742e1a2e21e3462b5
41+
specs:
42+
rspec-support (3.9.0.pre)
43+
144
GEM
245
remote: https://rubygems.org/
346
specs:
@@ -209,23 +252,6 @@ GEM
209252
responders (3.0.0)
210253
actionpack (>= 5.0)
211254
railties (>= 5.0)
212-
rspec-core (3.8.2)
213-
rspec-support (~> 3.8.0)
214-
rspec-expectations (3.8.4)
215-
diff-lcs (>= 1.2.0, < 2.0)
216-
rspec-support (~> 3.8.0)
217-
rspec-mocks (3.8.1)
218-
diff-lcs (>= 1.2.0, < 2.0)
219-
rspec-support (~> 3.8.0)
220-
rspec-rails (3.8.2)
221-
actionpack (>= 3.0)
222-
activesupport (>= 3.0)
223-
railties (>= 3.0)
224-
rspec-core (~> 3.8.0)
225-
rspec-expectations (~> 3.8.0)
226-
rspec-mocks (~> 3.8.0)
227-
rspec-support (~> 3.8.0)
228-
rspec-support (3.8.2)
229255
ruby_dep (1.5.0)
230256
rubyzip (1.2.3)
231257
sass (3.7.4)
@@ -309,7 +335,11 @@ DEPENDENCIES
309335
listen (>= 3.0.5, < 3.2)
310336
puma (~> 3.11)
311337
rails (~> 6.0.0.rc2)
312-
rspec-rails
338+
rspec-core!
339+
rspec-expectations!
340+
rspec-mocks!
341+
rspec-rails!
342+
rspec-support!
313343
sass-rails (~> 5.0)
314344
selenium-webdriver
315345
spring

db/migrate/20190810223426_create_posts.rb

-10
This file was deleted.

0 commit comments

Comments
 (0)