Skip to content

Commit 15db765

Browse files
authored
Rubocop and rspec fixes (#6304)
1 parent 6b06fba commit 15db765

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

app/controllers/api/v1/users_controller.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,14 @@ def create
7676

7777
if user.save
7878
if smtp_enabled
79-
if invited
80-
UserMailer.with(user:, admin_panel_url:, base_url: request.base_url, provider: current_provider).new_user_signup_email.deliver_later
81-
else
79+
unless invited
8280
token = user.generate_activation_token!
8381
UserMailer.with(user:,
8482
activation_url: activate_account_url(token), base_url: request.base_url,
8583
provider: current_provider).activate_account_email.deliver_later
8684

87-
UserMailer.with(user:, admin_panel_url:, base_url: request.base_url, provider: current_provider).new_user_signup_email.deliver_later
8885
end
86+
UserMailer.with(user:, admin_panel_url:, base_url: request.base_url, provider: current_provider).new_user_signup_email.deliver_later
8987
end
9088

9189
create_default_room(user)

spec/controllers/locales_controller_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
end
3636

3737
it 'returns the dialect language file if the regular language doesnt exist' do
38-
get :show, params: { name: 'pl' }
39-
expect(response).to redirect_to(ActionController::Base.helpers.asset_path('pl_PL.json'))
38+
get :show, params: { name: 'ko' }
39+
expect(response).to redirect_to(ActionController::Base.helpers.asset_path('ko_KR.json'))
4040
end
4141

4242
it 'returns not_acceptable if the language doesnt exist' do

0 commit comments

Comments
 (0)