Skip to content

Commit

Permalink
Remove rails-controller-testing gem (mastodon#33955)
Browse files Browse the repository at this point in the history
  • Loading branch information
mjankowski authored Feb 21, 2025
1 parent 68e5f0c commit db97197
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
3 changes: 0 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,6 @@ group :test do
# Used to mock environment variables
gem 'climate_control'

# Add back helpers functions removed in Rails 5.1
gem 'rails-controller-testing', '~> 1.0'

# Validate schemas in specs
gem 'json-schema', '~> 5.0'

Expand Down
5 changes: 0 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -641,10 +641,6 @@ GEM
activesupport (= 8.0.1)
bundler (>= 1.15.0)
railties (= 8.0.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand Down Expand Up @@ -1009,7 +1005,6 @@ DEPENDENCIES
rack-cors (~> 2.0)
rack-test (~> 2.1)
rails (~> 8.0)
rails-controller-testing (~> 1.0)
rails-i18n (~> 8.0)
rdf-normalize (~> 0.5)
redcarpet (~> 3.6)
Expand Down
9 changes: 6 additions & 3 deletions spec/controllers/admin/domain_blocks_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@

expect(DomainBlockWorker).to_not have_received(:perform_async)

expect(response).to render_template :new
expect(response.parsed_body.title)
.to match(I18n.t('admin.domain_blocks.new.title'))
end
end

Expand All @@ -84,7 +85,8 @@

expect(DomainBlockWorker).to_not have_received(:perform_async)

expect(response).to render_template :confirm_suspension
expect(response.parsed_body.title)
.to match(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
end
end

Expand Down Expand Up @@ -119,7 +121,8 @@

expect(DomainBlockWorker).to_not have_received(:perform_async)

expect(response).to render_template :confirm_suspension
expect(response.parsed_body.title)
.to match(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
end
end

Expand Down

0 comments on commit db97197

Please sign in to comment.