Merge branch 'youtrack-verify-new_issue_url-removal' into 'add_YouTrack_integration'

Update external issue tracker services test

See merge request bessorion/gitlab-ce!2

app/models/project_services/youtrack_service.rb

@@ -3,7 +3,7 @@
 class YoutrackService < IssueTrackerService
   validates :project_url, :issues_url, presence: true, public_url: true, if: :activated?
 
-  prop_accessor :title, :description, :project_url, :issues_url
+  prop_accessor :description, :project_url, :issues_url
 
   # {PROJECT-KEY}-{NUMBER} Examples: YT-1, PRJ-1
   def self.reference_pattern(only_long: false)

spec/features/projects/services/user_activates_issue_tracker_spec.rb

@@ -6,11 +6,17 @@ describe 'User activates issue tracker', :js do
 
   let(:url) { 'http://tracker.example.com' }
 
-  def fill_form(active = true)
+  def fill_short_form(active = true)
     check 'Active' if active
 
     fill_in 'service_project_url', with: url
     fill_in 'service_issues_url', with: "#{url}/:id"
+  end
+
+  def fill_full_form(active = true)
+    fill_short_form(active)
+    check 'Active' if active
+
     fill_in 'service_new_issue_url', with: url
   end
 
@@ -21,14 +27,20 @@ describe 'User activates issue tracker', :js do
     visit project_settings_integrations_path(project)
   end
 
-  shared_examples 'external issue tracker activation' do |tracker:|
+  shared_examples 'external issue tracker activation' do |tracker:, skip_new_issue_url: false|
     describe 'user sets and activates the Service' do
       context 'when the connection test succeeds' do
         before do
           stub_request(:head, url).to_return(headers: { 'Content-Type' => 'application/json' })
 
           click_link(tracker)
-          fill_form
+
+          if skip_new_issue_url
+            fill_short_form
+          else
+            fill_full_form
+          end
+
           click_button('Test settings and save changes')
           wait_for_requests
         end
@@ -50,7 +62,13 @@ describe 'User activates issue tracker', :js do
           stub_request(:head, url).to_raise(HTTParty::Error)
 
           click_link(tracker)
-          fill_form
+
+          if skip_new_issue_url
+            fill_short_form
+          else
+            fill_full_form
+          end
+
           click_button('Test settings and save changes')
           wait_for_requests
 
@@ -69,7 +87,13 @@ describe 'User activates issue tracker', :js do
     describe 'user sets the service but keeps it disabled' do
       before do
         click_link(tracker)
-        fill_form(false)
+
+        if skip_new_issue_url
+          fill_short_form(false)
+        else
+          fill_full_form(false)
+        end
+
         click_button('Save changes')
       end
 
@@ -87,6 +111,7 @@ describe 'User activates issue tracker', :js do
   end
 
   it_behaves_like 'external issue tracker activation', tracker: 'Redmine'
+  it_behaves_like 'external issue tracker activation', tracker: 'YouTrack', skip_new_issue_url: true
   it_behaves_like 'external issue tracker activation', tracker: 'Bugzilla'
   it_behaves_like 'external issue tracker activation', tracker: 'Custom Issue Tracker'
 end