Add latest changes from gitlab-org/gitlab@master

lib/gitlab/auth/o_auth/provider.rb

@@ -18,7 +18,7 @@ module Gitlab
           authenticator =
             case provider
             when /^ldap/
-              Gitlab::Auth::LDAP::Authentication
+              Gitlab::Auth::Ldap::Authentication
             when 'database'
               Gitlab::Auth::Database::Authentication
             end
@@ -60,8 +60,8 @@ module Gitlab
         def self.config_for(name)
           name = name.to_s
           if ldap_provider?(name)
-            if Gitlab::Auth::LDAP::Config.valid_provider?(name)
-              Gitlab::Auth::LDAP::Config.new(name).options
+            if Gitlab::Auth::Ldap::Config.valid_provider?(name)
+              Gitlab::Auth::Ldap::Config.new(name).options
             else
               nil
             end

lib/gitlab/auth/o_auth/user.rb

@@ -111,7 +111,7 @@ module Gitlab
         def find_or_build_ldap_user
           return unless ldap_person
-          user = Gitlab::Auth::LDAP::User.find_by_uid_and_provider(ldap_person.dn, ldap_person.provider)
+          user = Gitlab::Auth::Ldap::User.find_by_uid_and_provider(ldap_person.dn, ldap_person.provider)
           if user
             log.info "LDAP account found for user #{user.username}. Building new #{auth_hash.provider} identity."
             return user
@@ -141,8 +141,8 @@ module Gitlab
           return @ldap_person if defined?(@ldap_person)
           # Look for a corresponding person with same uid in any of the configured LDAP providers
-          Gitlab::Auth::LDAP::Config.providers.each do |provider|
-            adapter = Gitlab::Auth::LDAP::Adapter.new(provider)
+          Gitlab::Auth::Ldap::Config.providers.each do |provider|
+            adapter = Gitlab::Auth::Ldap::Adapter.new(provider)
             @ldap_person = find_ldap_person(auth_hash, adapter)
             break if @ldap_person
           end
@@ -150,15 +150,15 @@ module Gitlab
         end
         def find_ldap_person(auth_hash, adapter)
-          Gitlab::Auth::LDAP::Person.find_by_uid(auth_hash.uid, adapter) ||
-            Gitlab::Auth::LDAP::Person.find_by_email(auth_hash.uid, adapter) ||
-            Gitlab::Auth::LDAP::Person.find_by_dn(auth_hash.uid, adapter)
-        rescue Gitlab::Auth::LDAP::LDAPConnectionError
+          Gitlab::Auth::Ldap::Person.find_by_uid(auth_hash.uid, adapter) ||
+            Gitlab::Auth::Ldap::Person.find_by_email(auth_hash.uid, adapter) ||
+            Gitlab::Auth::Ldap::Person.find_by_dn(auth_hash.uid, adapter)
+        rescue Gitlab::Auth::Ldap::LdapConnectionError
           nil
         end
         def ldap_config
-          Gitlab::Auth::LDAP::Config.new(ldap_person.provider) if ldap_person
+          Gitlab::Auth::Ldap::Config.new(ldap_person.provider) if ldap_person
         end
         def needs_blocking?

lib/gitlab/user_access.rb

@@ -33,7 +33,7 @@ module Gitlab
       return false unless can_access_git?
       if user.requires_ldap_check? && user.try_obtain_ldap_lease
-        return false unless Gitlab::Auth::LDAP::Access.allowed?(user)
+        return false unless Gitlab::Auth::Ldap::Access.allowed?(user)
       end
       true

lib/system_check/ldap_check.rb

@@ -6,7 +6,7 @@ module SystemCheck
     set_name 'LDAP:'
     def multi_check
-      if Gitlab::Auth::LDAP::Config.enabled?
+      if Gitlab::Auth::Ldap::Config.enabled?
         # Only show up to 100 results because LDAP directories can be very big.
         # This setting only affects the `rake gitlab:check` script.
         limit = ENV['LDAP_CHECK_LIMIT']
@@ -21,13 +21,13 @@ module SystemCheck
     private
     def check_ldap(limit)
-      servers = Gitlab::Auth::LDAP::Config.providers
+      servers = Gitlab::Auth::Ldap::Config.providers
       servers.each do |server|
         $stdout.puts "Server: #{server}"
         begin
-          Gitlab::Auth::LDAP::Adapter.open(server) do |adapter|
+          Gitlab::Auth::Ldap::Adapter.open(server) do |adapter|
             check_ldap_auth(adapter)
             $stdout.puts "LDAP users with access to your GitLab server (only showing the first #{limit} results)"

lib/tasks/gitlab/cleanup.rake

@@ -13,7 +13,7 @@ namespace :gitlab do
         print "#{user.name} (#{user.ldap_identity.extern_uid}) ..."
-        if Gitlab::Auth::LDAP::Access.allowed?(user)
+        if Gitlab::Auth::Ldap::Access.allowed?(user)
           puts " [OK]".color(:green)
         else
           if block_flag

locale/gitlab.pot

@@ -1550,13 +1550,13 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
-msgid "Advanced permissions, Large File Storage and Two-Factor authentication settings."
+msgid "Advanced Settings"
 msgstr ""
-msgid "Advanced search functionality"
+msgid "Advanced permissions, Large File Storage and Two-Factor authentication settings."
 msgstr ""
-msgid "Advanced settings"
+msgid "Advanced search functionality"
 msgstr ""
 msgid "After a successful password update you will be redirected to login screen."
@@ -3991,6 +3991,9 @@ msgstr ""
 msgid "Closed this %{quick_action_target}."
 msgstr ""
+msgid "Closed: %{closedIssuesCount}"
+msgstr ""
+
 msgid "Closes this %{quick_action_target}."
 msgstr ""
@@ -4021,6 +4024,9 @@ msgstr ""
 msgid "ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster"
 msgstr ""
+msgid "ClusterIntegration|%{external_ip}.nip.io"
+msgstr ""
+
 msgid "ClusterIntegration|%{title} uninstalled successfully."
 msgstr ""
@@ -4057,7 +4063,7 @@ msgstr ""
 msgid "ClusterIntegration|Adding an integration will share the cluster across all projects."
 msgstr ""
-msgid "ClusterIntegration|Advanced options on this Kubernetes cluster's integration"
+msgid "ClusterIntegration|Advanced options on this Kubernetes cluster’s integration"
 msgstr ""
 msgid "ClusterIntegration|All data not committed to GitLab will be deleted and cannot be restored."
@@ -4093,9 +4099,6 @@ msgstr ""
 msgid "ClusterIntegration|Any running pipelines will be canceled."
 msgstr ""
-msgid "ClusterIntegration|Applications"
-msgstr ""
-
 msgid "ClusterIntegration|Apply for credit"
 msgstr ""
@@ -4147,9 +4150,6 @@ msgstr ""
 msgid "ClusterIntegration|Cluster being created"
 msgstr ""
-msgid "ClusterIntegration|Cluster health"
-msgstr ""
-
 msgid "ClusterIntegration|Cluster management project (alpha)"
 msgstr ""
@@ -4342,7 +4342,7 @@ msgstr ""
 msgid "ClusterIntegration|If you do not wish to delete all associated GitLab resources, you can simply remove the integration."
 msgstr ""
-msgid "ClusterIntegration|In order to view the health of your cluster, you must first install Prometheus below."
+msgid "ClusterIntegration|In order to view the health of your cluster, you must first install Prometheus in the Applications tab."
 msgstr ""
 msgid "ClusterIntegration|Ingress"
@@ -4366,9 +4366,6 @@ msgstr ""
 msgid "ClusterIntegration|Integrate Kubernetes cluster automation"
 msgstr ""
-msgid "ClusterIntegration|Integration status"
-msgstr ""
-
 msgid "ClusterIntegration|Issuer Email"
 msgstr ""
@@ -4405,9 +4402,6 @@ msgstr ""
 msgid "ClusterIntegration|Kubernetes cluster"
 msgstr ""
-msgid "ClusterIntegration|Kubernetes cluster details"
-msgstr ""
-
 msgid "ClusterIntegration|Kubernetes cluster is being created..."
 msgstr ""
@@ -4558,6 +4552,9 @@ msgstr ""
 msgid "ClusterIntegration|Prometheus is an open-source monitoring system with %{gitlabIntegrationLink} to monitor deployed applications."
 msgstr ""
+msgid "ClusterIntegration|Provider details"
+msgstr ""
+
 msgid "ClusterIntegration|Provision Role ARN"
 msgstr ""
@@ -5570,6 +5567,9 @@ msgstr ""
 msgid "Copy commit SHA"
 msgstr ""
+msgid "Copy evidence SHA"
+msgstr ""
+
 msgid "Copy file contents"
 msgstr ""
@@ -5630,9 +5630,6 @@ msgstr ""
 msgid "Could not create group"
 msgstr ""
-msgid "Could not create issue"
-msgstr ""
-
 msgid "Could not create project"
 msgstr ""
@@ -5642,9 +5639,6 @@ msgstr ""
 msgid "Could not delete chat nickname %{chat_name}."
 msgstr ""
-msgid "Could not fetch projects"
-msgstr ""
-
 msgid "Could not find design"
 msgstr ""
@@ -7840,6 +7834,9 @@ msgstr ""
 msgid "Epics|Something went wrong while creating child epics."
 msgstr ""
+msgid "Epics|Something went wrong while creating issue."
+msgstr ""
+
 msgid "Epics|Something went wrong while fetching child epics."
 msgstr ""
@@ -10288,6 +10285,9 @@ msgstr ""
 msgid "Header message"
 msgstr ""
+msgid "Health"
+msgstr ""
+
 msgid "Health Check"
 msgstr ""
@@ -13178,6 +13178,9 @@ msgstr ""
 msgid "No licenses found."
 msgstr ""
+msgid "No matches found"
+msgstr ""
+
 msgid "No matching labels"
 msgstr ""
@@ -13636,6 +13639,9 @@ msgstr ""
 msgid "Open source software to collaborate on code"
 msgstr ""
+msgid "Open: %{openIssuesCount}"
+msgstr ""
+
 msgid "Open: %{open} • Closed: %{closed}"
 msgstr ""
@@ -18320,6 +18326,9 @@ msgstr ""
 msgid "Something went wrong while fetching projects"
 msgstr ""
+msgid "Something went wrong while fetching projects."
+msgstr ""
+
 msgid "Something went wrong while fetching related merge requests."
 msgstr ""

qa/qa/page/project/operations/kubernetes/show.rb

@@ -10,17 +10,35 @@ module QA
               element :ingress_ip_address, 'id="ingress-endpoint"' # rubocop:disable QA/ElementWithPattern
             end
-            view 'app/views/clusters/clusters/_form.html.haml' do
+            view 'app/views/clusters/clusters/_gitlab_integration_form.html.haml' do
               element :integration_status_toggle, required: true
               element :base_domain_field, required: true
               element :save_changes_button, required: true
             end
+            view 'app/views/clusters/clusters/_details_tab.html.haml' do
+              element :details, required: true
+            end
+
+            view 'app/views/clusters/clusters/_applications_tab.html.haml' do
+              element :applications, required: true
+            end
+
             view 'app/assets/javascripts/clusters/components/application_row.vue' do
               element :install_button
               element :uninstall_button
             end
+            def open_details
+              has_element?(:details, wait: 30)
+              click_element :details
+            end
+
+            def open_applications
+              has_element?(:applications, wait: 30)
+              click_element :applications
+            end
+
             def install!(application_name)
               within_element(application_name) do
                 has_element?(:install_button, application: application_name, wait: 30)

qa/qa/resource/kubernetes_cluster.rb

@@ -38,6 +38,9 @@ module QA
             # We must wait a few seconds for permissions to be set up correctly for new cluster
             sleep 10
+            # Open applications tab
+            show.open_applications
+
             # Helm must be installed before everything else
             show.install!(:helm)
             show.await_installed(:helm)
@@ -52,6 +55,8 @@ module QA
             if @install_ingress
               populate(:ingress_ip)
+
+              show.open_details
               show.set_domain("#{ingress_ip}.nip.io")
               show.save_domain
             end

scripts/utils.sh

@@ -57,97 +57,3 @@ function echoinfo() {
     printf "\033[0;33m%s\n\033[0m" "${1}" >&2;
   fi
 }
-
-function get_job_id() {
-  local job_name="${1}"
-  local query_string="${2:+&${2}}"
-  local api_token="${API_TOKEN-${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}}"
-  if [ -z "${api_token}" ]; then
-    echoerr "Please provide an API token with \$API_TOKEN or \$GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN."
-    return
-  fi
-
-  local max_page=3
-  local page=1
-
-  while true; do
-    local url="https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/jobs?per_page=100&page=${page}${query_string}"
-    echoinfo "GET ${url}"
-
-    local job_id
-    job_id=$(curl --silent --show-error --header "PRIVATE-TOKEN: ${api_token}" "${url}" | jq "map(select(.name == \"${job_name}\")) | map(.id) | last")
-    [[ "${job_id}" == "null" && "${page}" -lt "$max_page" ]] || break
-
-    let "page++"
-  done
-
-  if [[ "${job_id}" == "" ]]; then
-    echoerr "The '${job_name}' job ID couldn't be retrieved!"
-  else
-    echoinfo "The '${job_name}' job ID is ${job_id}"
-    echo "${job_id}"
-  fi
-}
-
-function play_job() {
-  local job_name="${1}"
-  local job_id
-  job_id=$(get_job_id "${job_name}" "scope=manual");
-  if [ -z "${job_id}" ]; then return; fi
-
-  local api_token="${API_TOKEN-${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}}"
-  if [ -z "${api_token}" ]; then
-    echoerr "Please provide an API token with \$API_TOKEN or \$GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN."
-    return
-  fi
-
-  local url="https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/jobs/${job_id}/play"
-  echoinfo "POST ${url}"
-
-  local job_url
-  job_url=$(curl --silent --show-error --request POST --header "PRIVATE-TOKEN: ${api_token}" "${url}" | jq ".web_url")
-  echoinfo "Manual job '${job_name}' started at: ${job_url}"
-}
-
-function wait_for_job_to_be_done() {
-  local job_name="${1}"
-  local query_string="${2}"
-  local job_id
-  job_id=$(get_job_id "${job_name}" "${query_string}")
-  if [ -z "${job_id}" ]; then return; fi
-
-  local api_token="${API_TOKEN-${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}}"
-  if [ -z "${api_token}" ]; then
-    echoerr "Please provide an API token with \$API_TOKEN or \$GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN."
-    return
-  fi
-
-  echoinfo "Waiting for the '${job_name}' job to finish..."
-
-  local url="https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/jobs/${job_id}"
-  echoinfo "GET ${url}"
-
-  # In case the job hasn't finished yet. Keep trying until the job times out.
-  local interval=30
-  local elapsed_seconds=0
-  while true; do
-    local job_status
-    job_status=$(curl --silent --show-error --header "PRIVATE-TOKEN: ${api_token}" "${url}" | jq ".status" | sed -e s/\"//g)
-    [[ "${job_status}" == "pending" || "${job_status}" == "running" ]] || break
-
-    printf "."
-    let "elapsed_seconds+=interval"
-    sleep ${interval}
-  done
-
-  local elapsed_minutes=$((elapsed_seconds / 60))
-  echoinfo "Waited '${job_name}' for ${elapsed_minutes} minutes."
-
-  if [[ "${job_status}" == "failed" ]]; then
-    echoerr "The '${job_name}' failed."
-  elif [[ "${job_status}" == "manual" ]]; then
-    echoinfo "The '${job_name}' is manual."
-  else
-    echoinfo "The '${job_name}' passed."
-  fi
-}

spec/controllers/projects/releases_controller_spec.rb

@@ -198,6 +198,46 @@ describe Projects::ReleasesController do
     end
   end
+  context 'GET #downloads' do
+    subject do
+      get :downloads, params: { namespace_id: project.namespace, project_id: project, tag: tag, filepath: filepath }
+    end
+
+    before do
+      sign_in(user)
+    end
+
+    let(:release) { create(:release, project: project, tag: tag ) }
+    let!(:link) { create(:release_link, release: release, name: 'linux-amd64 binaries', filepath: '/binaries/linux-amd64', url: 'https://downloads.example.com/bin/gitlab-linux-amd64') }
+    let(:tag) { 'v11.9.0-rc2' }
+
+    context 'valid filepath' do
+      let(:filepath) { CGI.escape('/binaries/linux-amd64') }
+
+      it 'redirects to the asset direct link' do
+        subject
+
+        expect(response).to redirect_to('https://downloads.example.com/bin/gitlab-linux-amd64')
+      end
+
+      it 'redirects with a status of 302' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:redirect)
+      end
+    end
+
+    context 'invalid filepath' do
+      let(:filepath) { CGI.escape('/binaries/win32') }
+
+      it 'is not found' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
+
   context 'GET #downloads' do
     subject do
       get :downloads, params: {

spec/features/clusters/cluster_detail_page_spec.rb

@@ -17,7 +17,7 @@ describe 'Clusterable > Show page' do
     it 'allow the user to set domain' do
       visit cluster_path
-      within '#cluster-integration' do
+      within '.js-cluster-integration-form' do
         fill_in('cluster_base_domain', with: 'test.com')
         click_on 'Save changes'
       end
@@ -34,7 +34,7 @@ describe 'Clusterable > Show page' do
       end
       it 'shows help text with the domain as an alternative to custom domain' do
-        within '#cluster-integration' do
+        within '.js-cluster-integration-form' do
           expect(find(cluster_ingress_help_text_selector)).not_to match_css(hide_modifier_selector)
         end
       end
@@ -44,7 +44,7 @@ describe 'Clusterable > Show page' do
       it 'alternative to custom domain is not shown' do
         visit cluster_path
-        within '#cluster-integration' do
+        within '.js-cluster-integration-form' do
           expect(find(cluster_ingress_help_text_selector)).to match_css(hide_modifier_selector)
         end
       end
@@ -63,7 +63,7 @@ describe 'Clusterable > Show page' do
     end
     it 'is not able to edit the name, API url, CA certificate nor token' do
-      within('#js-cluster-details') do
+      within('.js-provider-details') do
         cluster_name_field = find('.cluster-name')
         api_url_field = find('#cluster_platform_kubernetes_attributes_api_url')
         ca_certificate_field = find('#cluster_platform_kubernetes_attributes_ca_cert')
@@ -77,6 +77,8 @@ describe 'Clusterable > Show page' do
     end
     it 'displays GKE information' do
+      click_link 'Advanced Settings'
+
       within('#advanced-settings-section') do
         expect(page).to have_content('Google Kubernetes Engine')
         expect(page).to have_content('Manage your Kubernetes cluster by visiting')
@@ -91,7 +93,7 @@ describe 'Clusterable > Show page' do
     end
     it 'is able to edit the name, API url, CA certificate and token' do
-      within('#js-cluster-details') do
+      within('.js-provider-details') do
         cluster_name_field = find('#cluster_name')
         api_url_field = find('#cluster_platform_kubernetes_attributes_api_url')
         ca_certificate_field = find('#cluster_platform_kubernetes_attributes_ca_cert')
@@ -105,6 +107,8 @@ describe 'Clusterable > Show page' do
     end
     it 'does not display GKE information' do
+      click_link 'Advanced Settings'
+
       within('#advanced-settings-section') do
         expect(page).not_to have_content('Google Kubernetes Engine')
         expect(page).not_to have_content('Manage your Kubernetes cluster by visiting')

spec/features/clusters/installing_applications_shared_examples.rb

@@ -17,6 +17,12 @@ shared_examples "installing applications on a cluster" do
   context 'when cluster is created' do
     let(:cluster) { create(:cluster, :provided_by_gcp, *cluster_factory_args) }
+    before do
+      page.within('.js-edit-cluster-form') do
+        click_link 'Applications'
+      end
+    end
+
     it 'user can install applications' do
       wait_for_requests
@@ -29,6 +35,7 @@ shared_examples "installing applications on a cluster" do
     context 'when user installs Helm' do
       before do
         allow(ClusterInstallAppWorker).to receive(:perform_async)
+        wait_for_requests
         page.within('.js-cluster-application-row-helm') do
           page.find(:css, '.js-cluster-application-install-button').click

spec/features/groups/clusters/user_spec.rb

@@ -34,7 +34,7 @@ describe 'User Cluster', :js do
         it 'user sees a cluster details page' do
           subject
-          expect(page).to have_content('Kubernetes cluster integration')
+          expect(page).to have_content('GitLab Integration')
           expect(page.find_field('cluster[name]').value).to eq('dev-cluster')
           expect(page.find_field('cluster[platform_kubernetes_attributes][api_url]').value)
             .to have_content('http://example.com')
@@ -93,7 +93,7 @@ describe 'User Cluster', :js do
     context 'when user disables the cluster' do
       before do
         page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click
-        page.within('#cluster-integration') { click_button 'Save changes' }
+        page.within('.js-cluster-integration-form') { click_button 'Save changes' }
       end
       it 'user sees the successful message' do
@@ -105,7 +105,7 @@ describe 'User Cluster', :js do
       before do
         fill_in 'cluster_name', with: 'my-dev-cluster'
         fill_in 'cluster_platform_kubernetes_attributes_token', with: 'new-token'
-        page.within('#js-cluster-details') { click_button 'Save changes' }
+        page.within('.js-provider-details') { click_button 'Save changes' }
       end
       it 'user sees the successful message' do
@@ -117,6 +117,7 @@ describe 'User Cluster', :js do
     context 'when user destroys the cluster' do
       before do
+        click_link 'Advanced Settings'
         click_button 'Remove integration and resources'
         fill_in 'confirm_cluster_name_input', with: cluster.name
         click_button 'Remove integration'

spec/features/projects/clusters/gcp_spec.rb

@@ -119,7 +119,7 @@ describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do
       context 'when user disables the cluster' do
         before do
           page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click
-          page.within('#cluster-integration') { click_button 'Save changes' }
+          page.within('.js-cluster-integration-form') { click_button 'Save changes' }
         end
         it 'user sees the successful message' do
@@ -130,7 +130,7 @@ describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do
       context 'when user changes cluster parameters' do
         before do
           fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace'
-          page.within('#js-cluster-details') { click_button 'Save changes' }
+          page.within('.js-provider-details') { click_button 'Save changes' }
         end
         it 'user sees the successful message' do
@@ -141,6 +141,7 @@ describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do
       context 'when user destroys the cluster' do
         before do
+          click_link 'Advanced Settings'
           click_button 'Remove integration and resources'
           fill_in 'confirm_cluster_name_input', with: cluster.name
           click_button 'Remove integration'

spec/features/projects/clusters/user_spec.rb

@@ -41,7 +41,7 @@ describe 'User Cluster', :js do
       it 'user sees a cluster details page' do
         subject
-        expect(page).to have_content('Kubernetes cluster integration')
+        expect(page).to have_content('GitLab Integration')
         expect(page.find_field('cluster[name]').value).to eq('dev-cluster')
         expect(page.find_field('cluster[platform_kubernetes_attributes][api_url]').value)
           .to have_content('http://example.com')
@@ -79,7 +79,7 @@ describe 'User Cluster', :js do
     context 'when user disables the cluster' do
       before do
         page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click
-        page.within('#cluster-integration') { click_button 'Save changes' }
+        page.within('.js-cluster-integration-form') { click_button 'Save changes' }
       end
       it 'user sees the successful message' do
@@ -91,7 +91,7 @@ describe 'User Cluster', :js do
       before do
         fill_in 'cluster_name', with: 'my-dev-cluster'
         fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace'
-        page.within('#js-cluster-details') { click_button 'Save changes' }
+        page.within('.js-provider-details') { click_button 'Save changes' }
       end
       it 'user sees the successful message' do
@@ -103,6 +103,7 @@ describe 'User Cluster', :js do
     context 'when user destroys the cluster' do
       before do
+        click_link 'Advanced Settings'
         click_button 'Remove integration and resources'
         fill_in 'confirm_cluster_name_input', with: cluster.name
         click_button 'Remove integration'

spec/features/projects/releases/user_views_releases_spec.rb

@@ -24,16 +24,31 @@ describe 'User views releases', :js do
   context 'when there is a link as an asset' do
     let!(:release_link) { create(:release_link, release: release, url: url ) }
     let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" }
+    let(:direct_asset_link) { Gitlab::Routing.url_helpers.project_release_url(project, release) << release_link.filepath }
     it 'sees the link' do
       visit project_releases_path(project)
       page.within('.js-assets-list') do
-        expect(page).to have_link release_link.name, href: release_link.url
+        expect(page).to have_link release_link.name, href: direct_asset_link
         expect(page).not_to have_content('(external source)')
       end
     end
+    context 'when there is a link redirect' do
+      let!(:release_link) { create(:release_link, release: release, name: 'linux-amd64 binaries', filepath: '/binaries/linux-amd64', url: url) }
+      let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" }
+
+      it 'sees the link' do
+        visit project_releases_path(project)
+
+        page.within('.js-assets-list') do
+          expect(page).to have_link release_link.name, href: direct_asset_link
+          expect(page).not_to have_content('(external source)')
+        end
+      end
+    end
+
     context 'when url points to external resource' do
       let(:url) { 'http://google.com/download' }

spec/features/projects/snippets/user_updates_snippet_spec.rb

@@ -38,7 +38,7 @@ describe 'Projects > Snippets > User updates a snippet' do
     end
     it 'renders edit page and displays the error' do
-      expect(page).to have_content('Error updating the snippet')
+      expect(page.find('.flash-container span').text).to eq('Error updating the snippet')
       expect(page).to have_content('Edit Snippet')
     end
   end

spec/features/snippets/user_edits_snippet_spec.rb

@@ -71,7 +71,7 @@ describe 'User edits snippet', :js do
     end
     it 'renders edit page and displays the error' do
-      expect(page).to have_content('Error updating the snippet')
+      expect(page.find('.flash-container span').text).to eq('Error updating the snippet')
       expect(page).to have_content('Edit Snippet')
     end
   end

spec/frontend/releases/components/evidence_block_spec.js

@@ -67,7 +67,7 @@ describe('Evidence Block', () => {
     });
     it('renders the correct hover text', () => {
-      expect(wrapper.find(ClipboardButton).attributes('title')).toBe('Copy commit SHA');
+      expect(wrapper.find(ClipboardButton).attributes('title')).toBe('Copy evidence SHA');
     });
     it('copies the sha', () => {

spec/frontend/releases/components/release_block_milestone_info_spec.js

@@ -10,11 +10,9 @@ describe('Release block milestone info', () => {
   let wrapper;
   let milestones;
-  const factory = milestonesProp => {
+  const factory = props => {
     wrapper = mount(ReleaseBlockMilestoneInfo, {
-      propsData: {
-        milestones: milestonesProp,
-      },
+      propsData: props,
     });
     return wrapper.vm.$nextTick();
@@ -26,6 +24,7 @@ describe('Release block milestone info', () => {
   afterEach(() => {
     wrapper.destroy();
+    wrapper = null;
   });
   const milestoneProgressBarContainer = () => wrapper.find('.js-milestone-progress-bar-container');
@@ -33,7 +32,7 @@ describe('Release block milestone info', () => {
   const issuesContainer = () => wrapper.find('.js-issues-container');
   describe('with default props', () => {
-    beforeEach(() => factory(milestones));
+    beforeEach(() => factory({ milestones }));
     it('renders the correct percentage', () => {
       expect(milestoneProgressBarContainer().text()).toContain('41% complete');
@@ -102,7 +101,7 @@ describe('Release block milestone info', () => {
         .map(m => m.title)
         .join(' • ');
-      return factory(lotsOfMilestones);
+      return factory({ milestones: lotsOfMilestones });
     });
     const clickShowMoreFewerButton = () => {
@@ -153,12 +152,12 @@ describe('Release block milestone info', () => {
         ...m,
         issueStats: {
           ...m.issueStats,
-          opened: 0,
+          total: 0,
           closed: 0,
         },
       }));
-      return factory(milestones);
+      return factory({ milestones });
     });
     expectAllZeros();
@@ -171,9 +170,72 @@ describe('Release block milestone info', () => {
         issueStats: undefined,
       }));
-      return factory(milestones);
+      return factory({ milestones });
     });
     expectAllZeros();
   });
+
+  describe('Issue links', () => {
+    const findOpenIssuesLink = () => wrapper.find({ ref: 'openIssuesLink' });
+    const findOpenIssuesText = () => wrapper.find({ ref: 'openIssuesText' });
+    const findClosedIssuesLink = () => wrapper.find({ ref: 'closedIssuesLink' });
+    const findClosedIssuesText = () => wrapper.find({ ref: 'closedIssuesText' });
+
+    describe('when openIssuePath is provided', () => {
+      const openIssuesPath = '/path/to/open/issues';
+
+      beforeEach(() => {
+        return factory({ milestones, openIssuesPath });
+      });
+
+      it('renders the open issues as a link', () => {
+        expect(findOpenIssuesLink().exists()).toBe(true);
+        expect(findOpenIssuesText().exists()).toBe(false);
+      });
+
+      it('renders the open issues link with the correct href', () => {
+        expect(findOpenIssuesLink().attributes().href).toBe(openIssuesPath);
+      });
+    });
+
+    describe('when openIssuePath is not provided', () => {
+      beforeEach(() => {
+        return factory({ milestones });
+      });
+
+      it('renders the open issues as plain text', () => {
+        expect(findOpenIssuesLink().exists()).toBe(false);
+        expect(findOpenIssuesText().exists()).toBe(true);
+      });
+    });
+
+    describe('when closedIssuePath is provided', () => {
+      const closedIssuesPath = '/path/to/closed/issues';
+
+      beforeEach(() => {
+        return factory({ milestones, closedIssuesPath });
+      });
+
+      it('renders the closed issues as a link', () => {
+        expect(findClosedIssuesLink().exists()).toBe(true);
+        expect(findClosedIssuesText().exists()).toBe(false);
+      });
+
+      it('renders the closed issues link with the correct href', () => {
+        expect(findClosedIssuesLink().attributes().href).toBe(closedIssuesPath);
+      });
+    });
+
+    describe('when closedIssuePath is not provided', () => {
+      beforeEach(() => {
+        return factory({ milestones });
+      });
+
+      it('renders the closed issues as plain text', () => {
+        expect(findClosedIssuesLink().exists()).toBe(false);
+        expect(findClosedIssuesText().exists()).toBe(true);
+      });
+    });
+  });
 });