Skip to content

build(deps): Updates shoulda and shoulda-matchers #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ end

group :test do
gem 'test-unit', '~> 3.0'
gem 'shoulda', '~> 3.5'
gem 'shoulda-matchers', '~> 2.0'
gem 'shoulda', '~> 4.0.0'
gem 'shoulda-matchers', '~> 4.4.0'
gem 'minitest-reporters'
gem 'valid_attribute'
gem 'factory_bot_rails'
Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -361,12 +361,12 @@ GEM
ruby_http_client (~> 3.4)
sexp_processor (4.15.0)
shellany (0.0.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 (4.0.0)
shoulda-context (~> 2.0)
shoulda-matchers (~> 4.0)
shoulda-context (2.0.0)
shoulda-matchers (4.4.1)
activesupport (>= 4.2.0)
sidekiq (6.0.7)
connection_pool (>= 2.2.2)
rack (~> 2.0)
Expand Down Expand Up @@ -408,7 +408,7 @@ GEM
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.8)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -487,8 +487,8 @@ DEPENDENCIES
selectize-rails
selenium-webdriver
sendgrid-actionmailer
shoulda (~> 3.5)
shoulda-matchers (~> 2.0)
shoulda (~> 4.0.0)
shoulda-matchers (~> 4.4.0)
sidekiq (< 7)
sidekiq-cron (~> 1.1)
simple_form
Expand Down
2 changes: 1 addition & 1 deletion test/models/questionnaire_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class QuestionnaireTest < ActiveSupport::TestCase

should belong_to :user
should belong_to :school
should belong_to :bus_list
should belong_to(:bus_list).optional
should have_and_belong_to_many :agreements

should validate_uniqueness_of :user_id
Expand Down
2 changes: 1 addition & 1 deletion test/models/user_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class UserTest < ActiveSupport::TestCase
should strip_attribute :last_name
should strip_attribute :email

should validate_uniqueness_of :email
should validate_uniqueness_of(:email).ignoring_case_sensitivity

should validate_presence_of :first_name
should validate_presence_of :last_name
Expand Down
7 changes: 7 additions & 0 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,10 @@ class ActiveSupport::TestCase
class ActionController::TestCase
include Devise::Test::ControllerHelpers
end

Shoulda::Matchers.configure do |config|
config.integrate do |with|
with.test_framework :minitest
with.library :rails
end
end
Binary file removed vendor/cache/shoulda-3.5.0.gem
Binary file not shown.
Binary file added vendor/cache/shoulda-4.0.0.gem
Binary file not shown.
Binary file removed vendor/cache/shoulda-context-1.2.2.gem
Binary file not shown.
Binary file added vendor/cache/shoulda-context-2.0.0.gem
Binary file not shown.
Binary file removed vendor/cache/shoulda-matchers-2.8.0.gem
Binary file not shown.
Binary file added vendor/cache/shoulda-matchers-4.4.1.gem
Binary file not shown.
Binary file added vendor/cache/tzinfo-1.2.9.gem
Binary file not shown.