Add latest changes from gitlab-org/gitlab@master

6 files changed, 4 insertions, 110 deletions

diff --git a/spec/features/monitor_sidebar_link_spec.rb b/spec/features/monitor_sidebar_link_spec.rb
index f612956600f..4f529179522 100644
--- a/spec/features/monitor_sidebar_link_spec.rb
+++ b/spec/features/monitor_sidebar_link_spec.rb
@@ -64,7 +64,6 @@ RSpec.describe 'Monitor dropdown sidebar', :aggregate_failures do
       expect(page).not_to have_link('Metrics', href: project_metrics_dashboard_path(project))
       expect(page).not_to have_link('Alerts', href: project_alert_management_index_path(project))
       expect(page).not_to have_link('Error Tracking', href: project_error_tracking_index_path(project))
-      expect(page).not_to have_link('Product Analytics', href: project_product_analytics_path(project))
       expect(page).not_to have_link('Kubernetes', href: project_clusters_path(project))
     end
 
@@ -119,7 +118,6 @@ RSpec.describe 'Monitor dropdown sidebar', :aggregate_failures do
       expect(page).not_to have_link('Metrics', href: project_metrics_dashboard_path(project))
       expect(page).not_to have_link('Alerts', href: project_alert_management_index_path(project))
       expect(page).not_to have_link('Error Tracking', href: project_error_tracking_index_path(project))
-      expect(page).not_to have_link('Product Analytics', href: project_product_analytics_path(project))
       expect(page).not_to have_link('Kubernetes', href: project_clusters_path(project))
     end
 
@@ -135,7 +133,6 @@ RSpec.describe 'Monitor dropdown sidebar', :aggregate_failures do
       expect(page).to have_link('Incidents', href: project_incidents_path(project))
       expect(page).to have_link('Environments', href: project_environments_path(project))
       expect(page).to have_link('Error Tracking', href: project_error_tracking_index_path(project))
-      expect(page).to have_link('Product Analytics', href: project_product_analytics_path(project))
 
       expect(page).not_to have_link('Alerts', href: project_alert_management_index_path(project))
       expect(page).not_to have_link('Kubernetes', href: project_clusters_path(project))
@@ -154,7 +151,6 @@ RSpec.describe 'Monitor dropdown sidebar', :aggregate_failures do
       expect(page).to have_link('Incidents', href: project_incidents_path(project))
       expect(page).to have_link('Environments', href: project_environments_path(project))
       expect(page).to have_link('Error Tracking', href: project_error_tracking_index_path(project))
-      expect(page).to have_link('Product Analytics', href: project_product_analytics_path(project))
       expect(page).to have_link('Kubernetes', href: project_clusters_path(project))
     end
 
@@ -171,7 +167,6 @@ RSpec.describe 'Monitor dropdown sidebar', :aggregate_failures do
       expect(page).to have_link('Incidents', href: project_incidents_path(project))
       expect(page).to have_link('Environments', href: project_environments_path(project))
       expect(page).to have_link('Error Tracking', href: project_error_tracking_index_path(project))
-      expect(page).to have_link('Product Analytics', href: project_product_analytics_path(project))
       expect(page).to have_link('Kubernetes', href: project_clusters_path(project))
     end
 
diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb
index 3252b5eaa95..e569fef76f8 100644
--- a/spec/features/projects/pipeline_schedules_spec.rb
+++ b/spec/features/projects/pipeline_schedules_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe 'Pipeline Schedules', :js do
         description = find_field('schedule_description').value
         expect(description).to eq('pipeline schedule')
         expect(page).to have_button('master')
-        expect(page).to have_button('UTC')
+        expect(page).to have_button('Select timezone')
       end
 
       it 'edits the scheduled pipeline' do
@@ -164,7 +164,7 @@ RSpec.describe 'Pipeline Schedules', :js do
 
       it 'sets defaults for timezone and target branch' do
         expect(page).to have_button('master')
-        expect(page).to have_button('UTC')
+        expect(page).to have_button('Select timezone')
       end
 
       it 'creates a new scheduled pipeline' do
@@ -314,8 +314,8 @@ RSpec.describe 'Pipeline Schedules', :js do
   end
 
   def select_timezone
-    find('.js-timezone-dropdown').click
-    click_link 'American Samoa'
+    find('[data-testid="schedule-timezone"] .dropdown-toggle').click
+    find("button", text: "Arizona").click
   end
 
   def select_target_branch
diff --git a/spec/features/projects/product_analytics/events_spec.rb b/spec/features/projects/product_analytics/events_spec.rb
deleted file mode 100644
index 05d12e12acb..00000000000
--- a/spec/features/projects/product_analytics/events_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'Product Analytics > Events' do
-  let_it_be(:project) { create(:project_empty_repo) }
-  let_it_be(:user) { create(:user) }
-
-  let(:event) { create(:product_analytics_event, project: project) }
-
-  before do
-    project.add_maintainer(user)
-    sign_in(user)
-  end
-
-  it 'shows no events message' do
-    visit(project_product_analytics_path(project))
-
-    expect(page).to have_content('There are currently no events')
-  end
-
-  it 'shows events' do
-    event
-
-    visit(project_product_analytics_path(project))
-
-    expect(page).to have_content('dvce_created_tstamp')
-    expect(page).to have_content(event.event_id)
-  end
-end
diff --git a/spec/features/projects/product_analytics/graphs_spec.rb b/spec/features/projects/product_analytics/graphs_spec.rb
deleted file mode 100644
index e2293893589..00000000000
--- a/spec/features/projects/product_analytics/graphs_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'Product Analytics > Graphs' do
-  let_it_be(:project) { create(:project) }
-  let_it_be(:user) { create(:user) }
-
-  before do
-    project.add_maintainer(user)
-    sign_in(user)
-  end
-
-  it 'shows graphs', :js do
-    create(:product_analytics_event, project: project)
-
-    visit(graphs_project_product_analytics_path(project))
-
-    expect(page).to have_content('Showing graphs based on events')
-    expect(page).to have_content('platform')
-    expect(page).to have_content('os_timezone')
-    expect(page).to have_content('br_lang')
-    expect(page).to have_content('doc_charset')
-  end
-end
diff --git a/spec/features/projects/product_analytics/setup_spec.rb b/spec/features/projects/product_analytics/setup_spec.rb
deleted file mode 100644
index 45c2b67502c..00000000000
--- a/spec/features/projects/product_analytics/setup_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'Product Analytics > Setup' do
-  let_it_be(:project) { create(:project_empty_repo) }
-  let_it_be(:user) { create(:user) }
-
-  before do
-    project.add_maintainer(user)
-    sign_in(user)
-  end
-
-  it 'shows the setup instructions' do
-    visit(setup_project_product_analytics_path(project))
-
-    expect(page).to have_content('Copy the code below to implement tracking in your application')
-  end
-end
diff --git a/spec/features/projects/product_analytics/test_spec.rb b/spec/features/projects/product_analytics/test_spec.rb
deleted file mode 100644
index 8984fb409d1..00000000000
--- a/spec/features/projects/product_analytics/test_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'Product Analytics > Test' do
-  let_it_be(:project) { create(:project_empty_repo) }
-  let_it_be(:user) { create(:user) }
-
-  before do
-    project.add_maintainer(user)
-    sign_in(user)
-  end
-
-  it 'says it sends a payload' do
-    visit(test_project_product_analytics_path(project))
-
-    expect(page).to have_content('This page sends a payload.')
-  end
-
-  it 'shows the last event if there is one' do
-    event = create(:product_analytics_event, project: project)
-
-    visit(test_project_product_analytics_path(project))
-
-    expect(page).to have_content(event.event_id)
-  end
-end