Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.
This commit is contained in:
@@ -27,7 +27,7 @@ describe ApplicationController, type: :controller do
|
||||
expect(response).to have_http_status(code)
|
||||
end
|
||||
|
||||
it "renders template for http" do
|
||||
it 'renders template for http' do
|
||||
is_expected.to render_template("errors/#{code}", layout: 'error')
|
||||
end
|
||||
end
|
||||
@@ -150,7 +150,7 @@ describe ApplicationController, type: :controller do
|
||||
end
|
||||
|
||||
it 'does not store location for user if it is devise controller' do
|
||||
@request.env["devise.mapping"] = Devise.mappings[:user]
|
||||
@request.env['devise.mapping'] = Devise.mappings[:user]
|
||||
get 'create'
|
||||
expect(controller.stored_location_for(:user)).to be_nil
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user