mirror of
https://github.com/discourse/discourse.git
synced 2024-11-29 07:15:47 +08:00
Removed "shoulda" gem in favor of "shoulda-matchers" and update (#7387)
* Update shoulda gem * Remove shoulda gem in favor of shoulda-matchers only
This commit is contained in:
parent
ec4cd09210
commit
2b8487b0ea
2
Gemfile
2
Gemfile
|
@ -135,7 +135,7 @@ group :test, :development do
|
|||
gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false
|
||||
gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM =~ /linux/i ? 'rb-inotify' : false
|
||||
gem 'rspec-rails', require: false
|
||||
gem 'shoulda', require: false
|
||||
gem 'shoulda-matchers', '~> 3.1', '>= 3.1.3', require: false
|
||||
gem 'rspec-html-matchers'
|
||||
gem 'pry-nav'
|
||||
gem 'byebug', require: ENV['RM_INFO'].nil?
|
||||
|
|
14
Gemfile.lock
14
Gemfile.lock
|
@ -86,7 +86,7 @@ GEM
|
|||
open4 (~> 1.3)
|
||||
coderay (1.1.2)
|
||||
colored2 (3.1.2)
|
||||
concurrent-ruby (1.1.4)
|
||||
concurrent-ruby (1.1.5)
|
||||
connection_pool (2.2.2)
|
||||
cork (0.3.0)
|
||||
colored2 (~> 3.1)
|
||||
|
@ -161,7 +161,7 @@ GEM
|
|||
hkdf (0.3.0)
|
||||
htmlentities (4.3.4)
|
||||
http_accept_language (2.0.5)
|
||||
i18n (1.5.3)
|
||||
i18n (1.6.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
image_size (1.5.0)
|
||||
in_threads (1.5.0)
|
||||
|
@ -400,12 +400,8 @@ GEM
|
|||
seed-fu (2.3.9)
|
||||
activerecord (>= 3.1)
|
||||
activesupport (>= 3.1)
|
||||
shoulda (3.5.0)
|
||||
shoulda-context (~> 1.0, >= 1.0.1)
|
||||
shoulda-matchers (>= 1.4.1, < 3.0)
|
||||
shoulda-context (1.2.2)
|
||||
shoulda-matchers (2.8.0)
|
||||
activesupport (>= 3.0.0)
|
||||
shoulda-matchers (3.1.3)
|
||||
activesupport (>= 4.0.0)
|
||||
sidekiq (5.2.5)
|
||||
connection_pool (~> 2.2, >= 2.2.2)
|
||||
rack (>= 1.5.0)
|
||||
|
@ -557,7 +553,7 @@ DEPENDENCIES
|
|||
sassc
|
||||
sassc-rails
|
||||
seed-fu
|
||||
shoulda
|
||||
shoulda-matchers (~> 3.1, >= 3.1.3)
|
||||
sidekiq
|
||||
simplecov
|
||||
sprockets-rails
|
||||
|
|
|
@ -11,7 +11,7 @@ describe Category do
|
|||
|
||||
it 'validates uniqueness of name' do
|
||||
Fabricate(:category)
|
||||
is_expected.to validate_uniqueness_of(:name).scoped_to(:parent_category_id)
|
||||
is_expected.to validate_uniqueness_of(:name).scoped_to(:parent_category_id).case_insensitive
|
||||
end
|
||||
|
||||
it 'validates inclusion of search_priority' do
|
||||
|
|
|
@ -42,9 +42,19 @@ end
|
|||
ENV["RAILS_ENV"] ||= 'test'
|
||||
require File.expand_path("../../config/environment", __FILE__)
|
||||
require 'rspec/rails'
|
||||
require 'shoulda'
|
||||
require 'shoulda-matchers'
|
||||
require 'sidekiq/testing'
|
||||
|
||||
# The shoulda-matchers gem no longer detects the test framework
|
||||
# you're using or mixes itself into that framework automatically.
|
||||
Shoulda::Matchers.configure do |config|
|
||||
config.integrate do |with|
|
||||
with.test_framework :rspec
|
||||
with.library :active_record
|
||||
with.library :active_model
|
||||
end
|
||||
end
|
||||
|
||||
# Requires supporting ruby files with custom matchers and macros, etc,
|
||||
# in spec/support/ and its subdirectories.
|
||||
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
|
||||
|
|
Loading…
Reference in New Issue
Block a user