Forráskód Böngészése

Update to unreleased rspec

Andrew Swistak 6 éve
szülő
commit
318a14f080
2 módosított fájl, 65 hozzáadás és 23 törlés
  1. 9 1
      Gemfile
  2. 56 22
      Gemfile.lock

+ 9 - 1
Gemfile

@@ -23,10 +23,18 @@ gem 'webpacker'
 group :development, :test do
   gem 'dotenv-rails'
   gem 'pry'
-  gem 'rspec-rails'
   gem 'rails-controller-testing'
   gem 'factory_bot_rails'
   gem 'faker'
+
+  # Using unreleased rspec version (since we're using Rails v6.0.0.beta3)
+  # The following refs were the latest commits on their respective master
+  # branches
+  gem 'rspec-support', github: "rspec/rspec-support", ref: "b2389"
+  gem 'rspec-expectations', github: "rspec/rspec-expectations", ref: "8d630"
+  gem 'rspec-mocks', github: "rspec/rspec-mocks", ref: "f1b69"
+  gem 'rspec-core', github: "rspec/rspec-core", :ref => "4a29a"
+  gem 'rspec-rails', github: "rspec/rspec-rails", branch: "4-0-dev"
 end
 
 group :development do

+ 56 - 22
Gemfile.lock

@@ -1,3 +1,50 @@
+GIT
+  remote: https://github.com/rspec/rspec-core.git
+  revision: 4a29a4b13d66fa96fbdff439a5c21ca9816eb1a3
+  ref: 4a29a
+  specs:
+    rspec-core (3.9.0.pre)
+      rspec-support (= 3.9.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-expectations.git
+  revision: 8d630d1e7ea7f8da0040cd22740d3763480402b8
+  ref: 8d630
+  specs:
+    rspec-expectations (3.9.0.pre)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.9.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-mocks.git
+  revision: f1b69945b0b9cfb33b3959985ce0b9ddd3b1844c
+  ref: f1b69
+  specs:
+    rspec-mocks (3.9.0.pre)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.9.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-rails.git
+  revision: d3f8915dc80a5e98e4b34e264f4a08a487b0293d
+  branch: 4-0-dev
+  specs:
+    rspec-rails (4.0.0.pre)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (= 3.9.0.pre)
+      rspec-expectations (= 3.9.0.pre)
+      rspec-mocks (= 3.9.0.pre)
+      rspec-support (= 3.9.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-support.git
+  revision: b23895e34f8cc1914d311ec3302f9092afbd2f93
+  ref: b2389
+  specs:
+    rspec-support (3.9.0.pre)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -82,10 +129,10 @@ GEM
     diff-lcs (1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.6.0)
-    dotenv-rails (2.6.0)
-      dotenv (= 2.6.0)
-      railties (>= 3.2, < 6.0)
+    dotenv (2.7.2)
+    dotenv-rails (2.7.2)
+      dotenv (= 2.7.2)
+      railties (>= 3.2, < 6.1)
     erubi (1.8.0)
     factory_bot (5.0.2)
       activesupport (>= 4.2.0)
@@ -183,23 +230,6 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
     sass (3.7.4)
@@ -272,7 +302,11 @@ DEPENDENCIES
   rails (~> 6.0.0.beta3)
   rails-controller-testing
   rest-client
-  rspec-rails
+  rspec-core!
+  rspec-expectations!
+  rspec-mocks!
+  rspec-rails!
+  rspec-support!
   sass-rails (~> 5.0)
   selenium-webdriver
   spring