diff --git a/Gemfile b/Gemfile index 397613dad..114af9104 100644 --- a/Gemfile +++ b/Gemfile @@ -157,7 +157,7 @@ group :test do gem "pundit-matchers", "~> 1.6" # A set of RSpec matchers for testing Pundit authorisation policies gem "rspec-retry", "~> 0.6" # retry intermittently failing rspec examples gem "ruby-prof", "~> 1.4", require: false # ruby-prof is a fast code profiler for Ruby - gem "shoulda-matchers", "~> 4.3.0", require: false # Simple one-liner tests for common Rails functionality + gem "shoulda-matchers", "~> 4.4.1", require: false # Simple one-liner tests for common Rails functionality gem "simplecov", "0.17.1", require: false # Code coverage with a powerful configuration library and automatic merging of coverage across test suites gem "stackprof", "~> 0.2", require: false, platforms: :ruby # stackprof is a fast sampling profiler for ruby code, with cpu, wallclock and object allocation samplers gem "stripe-ruby-mock", "~> 3.0", require: "stripe_mock" # A drop-in library to test stripe without hitting their servers diff --git a/Gemfile.lock b/Gemfile.lock index 981f1250e..db1d32268 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -721,7 +721,7 @@ GEM rubyzip (>= 1.2.2) semantic_range (2.3.0) shellany (0.0.1) - shoulda-matchers (4.3.0) + shoulda-matchers (4.4.1) activesupport (>= 4.2.0) sidekiq (6.1.1) connection_pool (>= 2.2.2) @@ -968,7 +968,7 @@ DEPENDENCIES s3_direct_upload (~> 0.1) sassc-rails (~> 2.1.2) sdoc (~> 1.1) - shoulda-matchers (~> 4.3.0) + shoulda-matchers (~> 4.4.1) sidekiq (~> 6.1.1) sidekiq-cron (~> 1.1) sidekiq-unique-jobs (~> 6.0.22) diff --git a/app/models/organization.rb b/app/models/organization.rb index 385340a77..55b92bb9f 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -11,7 +11,6 @@ class Organization < ApplicationRecord acts_as_followable - has_many :api_secrets, through: :users has_many :articles, dependent: :nullify has_many :collections, dependent: :nullify has_many :credits, dependent: :restrict_with_error diff --git a/spec/models/organization_spec.rb b/spec/models/organization_spec.rb index 99b3eaa25..2274e149c 100644 --- a/spec/models/organization_spec.rb +++ b/spec/models/organization_spec.rb @@ -7,7 +7,6 @@ RSpec.describe Organization, type: :model do describe "builtin validations" do subject { organization } - it { is_expected.to have_many(:api_secrets).through(:users) } it { is_expected.to have_many(:articles).dependent(:nullify) } it { is_expected.to have_many(:collections).dependent(:nullify) } it { is_expected.to have_many(:credits).dependent(:restrict_with_error) } diff --git a/vendor/cache/shoulda-matchers-4.3.0.gem b/vendor/cache/shoulda-matchers-4.3.0.gem deleted file mode 100644 index 17bea753c..000000000 Binary files a/vendor/cache/shoulda-matchers-4.3.0.gem and /dev/null differ diff --git a/vendor/cache/shoulda-matchers-4.4.1.gem b/vendor/cache/shoulda-matchers-4.4.1.gem new file mode 100644 index 000000000..6695d1a87 Binary files /dev/null and b/vendor/cache/shoulda-matchers-4.4.1.gem differ