Started on the rspec upgrade

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

4 files changed, 21 insertions, 16 deletions

diff --git a/Gemfile b/Gemfile
index 4d6d6e7e143..c3d8299e944 100644
--- a/Gemfile
+++ b/Gemfile
@@ -222,7 +222,7 @@ group :development, :test do
   gem 'rubocop', '0.28.0', require: false
   # gem 'rails-dev-tweaks'
   gem 'spinach-rails'
-  gem "rspec-rails"
+  gem "rspec-rails", '2.99'
   gem "capybara", '~> 2.2.1'
   gem "pry-rails"
   gem "awesome_print"
diff --git a/Gemfile.lock b/Gemfile.lock
index aef30046d33..3283da40f8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -459,21 +459,25 @@ GEM
       mime-types (>= 1.16)
     rinku (1.7.3)
     rouge (1.7.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-collection_matchers (1.1.2)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.99.3)
+    rspec-rails (2.99.0)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
+      rspec-collection_matchers
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
     rubocop (0.28.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.pre.7, < 3.0)
@@ -724,7 +728,7 @@ DEPENDENCIES
   redcarpet (~> 3.1.2)
   redis-rails
   request_store
-  rspec-rails
+  rspec-rails (= 2.99)
   rubocop (= 0.28.0)
   rugments
   sanitize (~> 2.0)
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index c82729a52e2..ebcc26852cc 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -5,7 +5,7 @@ describe IssuesHelper do
   let(:issue) { create :issue, project: project }
   let(:ext_project) { create :redmine_project }
 
-  describe :title_for_issue do
+  describe "title_for_issue" do
     it "should return issue title if used internal tracker" do
       @project = project
       title_for_issue(issue.iid).should eq issue.title
@@ -23,7 +23,7 @@ describe IssuesHelper do
     end
   end
 
-  describe :url_for_project_issues do
+  describe "url_for_project_issues" do
     let(:project_url) { ext_project.external_issue_tracker.project_url }
     let(:ext_expected) do
       project_url.gsub(':project_id', ext_project.id.to_s)
@@ -60,7 +60,7 @@ describe IssuesHelper do
     end
   end
 
-  describe :url_for_issue do
+  describe "url_for_issue" do
     let(:issues_url) { ext_project.external_issue_tracker.issues_url}
     let(:ext_expected) do
       issues_url.gsub(':id', issue.iid.to_s)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 773de6628b1..8352516a665 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -37,6 +37,7 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, type: :controller
 
   config.include TestEnv
+  config.infer_spec_type_from_file_location!
 
   config.before(:suite) do
     TestEnv.init