Skip to content
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
11 changes: 10 additions & 1 deletion app/controllers/settings/github_syncer_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def update
render json: {
error: {
type: :invalid_github_solution_syncer,
message: syncer.errors.full_messages.to_sentence
message: update_error_message(syncer)
}
}, status: :bad_request
end
Expand Down Expand Up @@ -84,4 +84,13 @@ def callback
def destroy
current_user.github_solution_syncer&.destroy
end

private
def update_error_message(syncer)
if syncer.errors.of_kind?(:main_branch_name, :invalid)
return t(".invalid_main_branch_name", max_length: User::GithubSolutionSyncer::MAX_BRANCH_NAME_LENGTH)
end

t(".failed")
end
end
3 changes: 3 additions & 0 deletions config/locales/views/settings/github_syncer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ en:
show:
github_syncer:
heading: GitHub Syncer
update:
invalid_main_branch_name: "The main branch name must be a valid Git branch name of up to %{max_length} characters, using only letters, numbers, dots, dashes, underscores and slashes."
failed: "We couldn't save your GitHub Syncer settings."
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ class Settings::GithubSyncerControllerTest < ActionDispatch::IntegrationTest
assert_response :bad_request
error = response.parsed_body["error"]
assert_equal "invalid_github_solution_syncer", error["type"]
assert_equal "Main branch name is invalid", error["message"]
expected = "The main branch name must be a valid Git branch name of up to 100 characters, " \
"using only letters, numbers, dots, dashes, underscores and slashes."
assert_equal expected, error["message"]

syncer.reload
assert_equal "main", syncer.main_branch_name
Expand Down
Loading