Update RSpec, fix gemfiles

CHANGELOG.md

@@ -6,6 +6,10 @@ User-visible changes worth mentioning.
 
 - [#] Your description here
 
+## 5.2.0
+
+- [#42] Add support for Doorkeeper >= 5.2
+
 ## 5.0.0
 
 - [#36] Fix ownership concern to be Mongodb specific

Gemfile

@@ -5,8 +5,8 @@ source "https://rubygems.org"
 gem "doorkeeper", path: "./doorkeeper"
 gem "mongoid"
 gem "rake"
-gem "rspec-core", git: "https://github.com/rspec/rspec-core.git"
-gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git"
-gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git"
-gem "rspec-rails", "4.0.0.beta3"
-gem "rspec-support", git: "https://github.com/rspec/rspec-support.git"
+gem "rspec-core"
+gem "rspec-expectations"
+gem "rspec-mocks"
+gem "rspec-rails", "~> 4.0.0"
+gem "rspec-support"

Gemfile.lock

@@ -1,32 +1,3 @@
-GIT
-  remote: https://github.com/rspec/rspec-core.git
-  revision: 002ebcb65324bca7b3ee044e22f4c02133fce14d
-  specs:
-    rspec-core (3.10.0.pre)
-      rspec-support (= 3.10.0.pre)
-
-GIT
-  remote: https://github.com/rspec/rspec-expectations.git
-  revision: 9f224eaeb5c6d7eaaab0f7f6e355efd9329328f8
-  specs:
-    rspec-expectations (3.10.0.pre)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (= 3.10.0.pre)
-
-GIT
-  remote: https://github.com/rspec/rspec-mocks.git
-  revision: 81c17e89b2722cb225d602e08b600e4a4f6148a4
-  specs:
-    rspec-mocks (3.10.0.pre)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (= 3.10.0.pre)
-
-GIT
-  remote: https://github.com/rspec/rspec-support.git
-  revision: 63c03e5e6f0ac858398933f820d37087f57c315a
-  specs:
-    rspec-support (3.10.0.pre)
-
 PATH
   remote: doorkeeper
   specs:
@@ -92,14 +63,23 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (13.0.1)
-    rspec-rails (4.0.0.beta3)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-rails (4.0.0)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
-      rspec-core (~> 3.8)
-      rspec-expectations (~> 3.8)
-      rspec-mocks (~> 3.8)
-      rspec-support (~> 3.8)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.9.2)
     thor (1.0.1)
     thread_safe (0.3.6)
     tzinfo (1.2.6)
@@ -112,11 +92,11 @@ DEPENDENCIES
   doorkeeper!
   mongoid
   rake
-  rspec-core!
-  rspec-expectations!
-  rspec-mocks!
-  rspec-rails (= 4.0.0.beta3)
-  rspec-support!
+  rspec-core
+  rspec-expectations
+  rspec-mocks
+  rspec-rails (~> 4.0.0)
+  rspec-support
 
 BUNDLED WITH
    1.17.3

gemfiles/Gemfile.common.rb

@@ -11,11 +11,8 @@
 gem "doorkeeper", "~> #{ENV["DOORKEEPER"]}"
 gem "bcrypt"
 
-gem "rspec-core", git: "https://github.com/rspec/rspec-core.git"
-gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git"
-gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git"
-gem "rspec-rails", "4.0.0.rc1"
-gem "rspec-support", git: "https://github.com/rspec/rspec-support.git"
-
-# Older Grape requires Ruby >= 2.2.2
-gem "grape", "~> 0.16", "< 0.19.2" if ENV["RAILS"][0] == "4"
+gem "rspec-core"
+gem "rspec-expectations"
+gem "rspec-mocks"
+gem "rspec-rails", "~> 4.0.0"
+gem "rspec-support"