Rename ErrorTrackingSetting#uri to #api_uri

6 files changed, 10 insertions, 10 deletions

diff --git a/app/controllers/projects/settings/operations/error_tracking_controller.rb b/app/controllers/projects/settings/operations/error_tracking_controller.rb
index 9409fcdc541..2ff6030f7eb 100644
--- a/app/controllers/projects/settings/operations/error_tracking_controller.rb
+++ b/app/controllers/projects/settings/operations/error_tracking_controller.rb
@@ -30,7 +30,7 @@ module Projects
         def setting_params
           params
             .require(:error_tracking_setting)
-            .permit(:enabled, :uri, :token)
+            .permit(:enabled, :api_uri, :token)
         end
       end
     end
diff --git a/app/models/error_tracking/error_tracking_setting.rb b/app/models/error_tracking/error_tracking_setting.rb
index c8ff3173227..ca0245c442c 100644
--- a/app/models/error_tracking/error_tracking_setting.rb
+++ b/app/models/error_tracking/error_tracking_setting.rb
@@ -4,7 +4,7 @@ module ErrorTracking
   class ErrorTrackingSetting < ActiveRecord::Base
     belongs_to :project
 
-    validates :uri, length: { maximum: 255 }, public_url: true
+    validates :api_uri, length: { maximum: 255 }, public_url: true
     validates :token, presence: true
 
     attr_encrypted :token,
diff --git a/app/views/projects/settings/operations/show.html.haml b/app/views/projects/settings/operations/show.html.haml
index c054b7fdaf1..99714145b68 100644
--- a/app/views/projects/settings/operations/show.html.haml
+++ b/app/views/projects/settings/operations/show.html.haml
@@ -16,8 +16,8 @@
             = f.check_box :enabled, class: 'form-check-input'
             = f.label :enabled, _('Active'), class: 'form-check-label'
         .form-group
-          = f.label :uri, _('Sentry API URL'), class: 'label-bold'
-          = f.url_field :uri, class: 'form-control', placeholder: _('http://<sentry-host>/api/0/projects/{organization_slug}/{project_slug}/issues/')
+          = f.label :api_uri, _('Sentry API URL'), class: 'label-bold'
+          = f.url_field :api_uri, class: 'form-control', placeholder: _('http://<sentry-host>/api/0/projects/{organization_slug}/{project_slug}/issues/')
           %p.form-text.text-muted
             = _('Enter your Sentry API URL')
         .form-group
diff --git a/spec/controllers/projects/settings/operations/error_tracking_controller_spec.rb b/spec/controllers/projects/settings/operations/error_tracking_controller_spec.rb
index 2001cfd440f..f0fe6efd96c 100644
--- a/spec/controllers/projects/settings/operations/error_tracking_controller_spec.rb
+++ b/spec/controllers/projects/settings/operations/error_tracking_controller_spec.rb
@@ -23,7 +23,7 @@ describe Projects::Settings::Operations::ErrorTrackingController do
     let(:error_tracking_params) do
       {
         enabled: '1',
-        uri: 'http://url',
+        api_uri: 'http://url',
         token: 'token'
       }
     end
diff --git a/spec/factories/error_tracking/error_setting_tracking.rb b/spec/factories/error_tracking/error_setting_tracking.rb
index c90940ab94c..03d7a0dd24b 100644
--- a/spec/factories/error_tracking/error_setting_tracking.rb
+++ b/spec/factories/error_tracking/error_setting_tracking.rb
@@ -4,7 +4,7 @@ FactoryBot.define do
   factory :error_tracking_setting, class: ErrorTracking::ErrorTrackingSetting do
     project
     enabled true
-    uri 'http://error_tracking.url'
+    api_uri 'http://error_tracking.url'
     token 'token'
   end
 end
diff --git a/spec/services/projects/error_tracking/setting_service_spec.rb b/spec/services/projects/error_tracking/setting_service_spec.rb
index b3c5fe3a476..66bae3ba8c2 100644
--- a/spec/services/projects/error_tracking/setting_service_spec.rb
+++ b/spec/services/projects/error_tracking/setting_service_spec.rb
@@ -10,7 +10,7 @@ describe Projects::ErrorTracking::SettingService do
   let(:params) do
     {
       enabled: true,
-      uri: 'http://error_tracking.url',
+      api_uri: 'http://error_tracking.url',
       token: 'token'
     }
   end
@@ -24,7 +24,7 @@ describe Projects::ErrorTracking::SettingService do
       let(:params) do
         {
           enabled: false,
-          uri: 'http://something',
+          api_uri: 'http://something',
           token: 'another token'
         }
       end
@@ -34,7 +34,7 @@ describe Projects::ErrorTracking::SettingService do
 
         project.reload
         expect(project.error_tracking_setting).not_to be_enabled
-        expect(project.error_tracking_setting.uri).to eq('http://something')
+        expect(project.error_tracking_setting.api_uri).to eq('http://something')
         expect(project.error_tracking_setting.token).to eq('another token')
       end
     end
@@ -44,7 +44,7 @@ describe Projects::ErrorTracking::SettingService do
         expect(result[:status]).to eq(:success)
 
         expect(project.error_tracking_setting).to be_enabled
-        expect(project.error_tracking_setting.uri).to eq('http://error_tracking.url')
+        expect(project.error_tracking_setting.api_uri).to eq('http://error_tracking.url')
         expect(project.error_tracking_setting.token).to eq('token')
       end
     end