updated errors

app/actions/providers/create_bitbucket_provider.rb

@@ -9,7 +9,7 @@ class Providers::CreateBitbucketProvider
     provider = context.provider
 
     if provider.username_param.blank?
-      provider.errors.add(:base, "Atlassian account email is required")
+      provider.errors.add(:username_param, "Atlassian account email is required")
       context.fail_and_return!("Atlassian account email is required")
       next
     end
@@ -27,14 +27,14 @@ class Providers::CreateBitbucketProvider
     )
     if response.code == 401
       message = "Invalid email or API token"
-      provider.errors.add(:base, message)
+      provider.errors.add(:access_token, message)
       context.fail_and_return!(message)
       next
     end
 
     if response.code != 200
       message = "Failed to validate credentials: #{response.body}"
-      provider.errors.add(:base, message)
+      provider.errors.add(:access_token, message)
       context.fail_and_return!(message)
       next
     end
@@ -53,7 +53,7 @@ class Providers::CreateBitbucketProvider
     provider.save!
   rescue Errno::ECONNREFUSED, SocketError => e
     message = "Could not connect to Bitbucket server: #{e.message}"
-    context.provider.errors.add(:base, message)
+    context.provider.errors.add(:registry_url, message)
     context.fail_and_return!(message)
   end
 end

app/actions/providers/create_docker_image_provider.rb

@@ -18,7 +18,7 @@ class Providers::CreateDockerImageProvider
         Rails.logger.info("Container registry authentication successful")
       end
     rescue DockerCli::AuthenticationError => e
-      context.provider.errors.add(:base, "Invalid credentials: #{e.message}")
+      context.provider.errors.add(:access_token, "Invalid credentials: #{e.message}")
       context.fail_and_return!(e.message)
     end
 

app/actions/providers/create_github_provider.rb

@@ -22,18 +22,18 @@ class Providers::CreateGithubProvider
       if (client.scopes & EXPECTED_SCOPES).sort != EXPECTED_SCOPES.sort
         message = "Invalid scopes. Please check that your personal access token has the following scopes: #{EXPECTED_SCOPES.join(", ")}"
         context.fail_and_return!(message)
-        context.provider.errors.add(:base, message)
+        context.provider.errors.add(:access_token, message)
         next
       end
     end
     context.provider.save!
   rescue Octokit::Unauthorized
     message = "Invalid access token"
-    context.provider.errors.add(:base, message)
+    context.provider.errors.add(:access_token, message)
     context.fail_and_return!(message)
   rescue Faraday::ConnectionFailed => e
     message = "Could not connect to GitHub server: #{e.message}"
-    context.provider.errors.add(:base, message)
+    context.provider.errors.add(:registry_url, message)
     context.fail_and_return!(message)
   end
 end

app/actions/providers/create_gitlab_provider.rb

@@ -17,7 +17,7 @@ class Providers::CreateGitlabProvider
     )
     if response.code != 200
       message = "Invalid access token"
-      context.provider.errors.add(:base, message)
+      context.provider.errors.add(:access_token, message)
       context.fail_and_return!(message)
       next
     end
@@ -26,7 +26,7 @@ class Providers::CreateGitlabProvider
     unless context.provider.enterprise?
       if (response["scopes"] & EXPECTED_SCOPES).sort != EXPECTED_SCOPES.sort
         message = "Invalid scopes. Please check that your personal access token has the following scopes: #{EXPECTED_SCOPES.join(", ")}"
-        context.provider.errors.add(:base, message)
+        context.provider.errors.add(:access_token, message)
         context.fail_and_return!(message)
         next
       end
@@ -40,7 +40,7 @@ class Providers::CreateGitlabProvider
     )
     if response.code != 200
       message = "Something went wrong while getting the user data"
-      context.provider.errors.add(:base, message)
+      context.provider.errors.add(:access_token, message)
       context.fail_and_return!(message)
       next
     end
@@ -50,7 +50,7 @@ class Providers::CreateGitlabProvider
     context.provider.save!
   rescue Errno::ECONNREFUSED, SocketError => e
     message = "Could not connect to GitLab server: #{e.message}"
-    context.provider.errors.add(:base, message)
+    context.provider.errors.add(:registry_url, message)
     context.fail_and_return!(message)
   end
 end

app/views/shared/_error_messages.html.erb

@@ -6,7 +6,8 @@
           <%= I18n.t("errors.messages.not_saved", count: resource.errors.count, resource: resource.class.model_name.human.downcase) %>
         </h4>
         <ul>
-          <% resource.errors.full_messages.each do |message| %>
+          <% resource.errors.each do |error| %>
+            <% message = error.attribute == :base ? error.message : error.message.capitalize %>
             <li><%= message %></li>
           <% end %>
         </ul>

spec/actions/providers/create_gitlab_provider_spec.rb

@@ -55,7 +55,7 @@ RSpec.describe Providers::CreateGitlabProvider do
 
       it 'adds an error to the provider' do
         subject
-        expect(provider.errors[:base]).to include("Invalid access token")
+        expect(provider.errors[:access_token]).to include("Invalid access token")
       end
     end
 

spec/actions/providers/create_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Providers::Create do
 
         it 'adds an error to the provider' do
           subject
-          expect(provider.errors[:base]).to include("Invalid access token")
+          expect(provider.errors[:access_token]).to include("Invalid access token")
         end
       end