Update shoulda-matchers

This outdated gem was the cause of those annoying MiniTest errors. Also updates one use of `ensure_inclusion_of` which was deprecated in favor of `validate_inclusion_of`.

Update shoulda-matchers
ed17adfb · Robert Speicher · 9de4e696 · ed17adfb · ed17adfb · ed17adfb
Commit ed17adfb authored Jan 29, 2015 by Robert Speicher
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +4 -4

members_spec.rb spec/models/members_spec.rb +1 -1

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -254,7 +254,7 @@ end

 group :test do
  gem "simplecov", require: false
-  gem "shoulda-matchers", "~> 2.1.0"
+  gem "shoulda-matchers", "~> 2.7.0"
  gem 'email_spec'
  gem "webmock"
  gem 'test_after_commit'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -260,7 +260,7 @@ GEM
      multi_xml (>= 0.5.2)
    httpauth (0.2.1)
    httpclient (2.5.3.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
    ice_nine (0.10.0)
    jasmine (2.0.2)
      jasmine-core (~> 2.0.0)
@@ -279,7 +279,7 @@ GEM
      turbolinks
    jquery-ui-rails (4.2.1)
      railties (>= 3.2.16)
-    json (1.8.1)
+    json (1.8.2)
    jwt (0.1.13)
      multi_json (>= 1.5)
    kaminari (0.15.1)
@@ -495,7 +495,7 @@ GEM
      sass (~> 3.2)
    settingslogic (2.0.9)
    sexp_processor (4.4.0)
-    shoulda-matchers (2.1.0)
+    shoulda-matchers (2.7.0)
      activesupport (>= 3.0.0)
    sidekiq (3.3.0)
      celluloid (>= 0.16.0)
@@ -719,7 +719,7 @@ DEPENDENCIES
  select2-rails
  semantic-ui-sass (~> 1.8.0)
  settingslogic
-  shoulda-matchers (~> 2.1.0)
+  shoulda-matchers (~> 2.7.0)
  sidekiq (~> 3.3)
  simplecov
  sinatra

--- a/spec/models/members_spec.rb
+++ b/spec/models/members_spec.rb
@@ -10,7 +10,7 @@ describe Member do

    it { should validate_presence_of(:user) }
    it { should validate_presence_of(:source) }
-    it { should ensure_inclusion_of(:access_level).in_array(Gitlab::Access.values) }
+    it { should validate_inclusion_of(:access_level).in_array(Gitlab::Access.values) }
  end

  describe "Delegate methods" do