diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-16 15:09:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-16 15:09:17 +0300 |
commit | 09dff3eec735ccbe001d165293ecebf195452071 (patch) | |
tree | 03c73077d0703edb9452145e7109835da2cd4918 /spec/features/cycle_analytics_spec.rb | |
parent | 78e911431fc575ff4f6c9b7e0f95c02b57a5e926 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/cycle_analytics_spec.rb')
-rw-r--r-- | spec/features/cycle_analytics_spec.rb | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb index 704adfa568d..a13aed35768 100644 --- a/spec/features/cycle_analytics_spec.rb +++ b/spec/features/cycle_analytics_spec.rb @@ -7,6 +7,7 @@ RSpec.describe 'Value Stream Analytics', :js do let_it_be(:guest) { create(:user) } let_it_be(:project) { create(:project, :repository) } let_it_be(:stage_table_selector) { '[data-testid="vsa-stage-table"]' } + let_it_be(:metrics_selector) { "[data-testid='vsa-time-metrics']" } let(:issue) { create(:issue, project: project, created_at: 2.days.ago) } let(:milestone) { create(:milestone, project: project) } @@ -26,11 +27,13 @@ RSpec.describe 'Value Stream Analytics', :js do wait_for_requests end - it 'shows pipeline summary' do - expect(new_issues_counter).to have_content('-') - expect(commits_counter).to have_content('-') - expect(deploys_counter).to have_content('-') - expect(deployment_frequency_counter).to have_content('-') + it 'displays metrics' do + aggregate_failures 'with relevant values' do + expect(new_issues_counter).to have_content('-') + expect(commits_counter).to have_content('-') + expect(deploys_counter).to have_content('-') + expect(deployment_frequency_counter).to have_content('-') + end end it 'shows active stage with empty message' do @@ -60,11 +63,15 @@ RSpec.describe 'Value Stream Analytics', :js do visit project_cycle_analytics_path(project) end - it 'shows pipeline summary' do - expect(new_issues_counter).to have_content('1') - expect(commits_counter).to have_content('2') - expect(deploys_counter).to have_content('1') - expect(deployment_frequency_counter).to have_content('0') + it 'displays metrics' do + metrics_tiles = page.find(metrics_selector) + + aggregate_failures 'with relevant values' do + expect(metrics_tiles).to have_content('Commit') + expect(metrics_tiles).to have_content('Deploy') + expect(metrics_tiles).to have_content('Deployment Frequency') + expect(metrics_tiles).to have_content('New Issue') + end end it 'shows data on each stage', :sidekiq_might_not_need_inline do @@ -96,7 +103,7 @@ RSpec.describe 'Value Stream Analytics', :js do end it 'shows only relevant data' do - expect(new_issues_counter).to have_content('1') + expect(new_issue_counter).to have_content('1') end end end @@ -116,7 +123,7 @@ RSpec.describe 'Value Stream Analytics', :js do end it 'does not show the commit stats' do - expect(page).to have_no_selector(:xpath, commits_counter_selector) + expect(page.find(metrics_selector)).not_to have_selector("#commits") end it 'needs permissions to see restricted stages' do @@ -130,28 +137,29 @@ RSpec.describe 'Value Stream Analytics', :js do end end - def new_issues_counter - find(:xpath, "//p[contains(text(),'New Issue')]/preceding-sibling::h3") + def find_metric_tile(sel) + page.find("#{metrics_selector} #{sel}") end - def commits_counter_selector - "//p[contains(text(),'Commits')]/preceding-sibling::h3" + # When now use proper pluralization for the metric names, which affects the id + def new_issue_counter + find_metric_tile("#new-issue") end - def commits_counter - find(:xpath, commits_counter_selector) + def new_issues_counter + find_metric_tile("#new-issues") end - def deploys_counter - find(:xpath, "//p[contains(text(),'Deploy')]/preceding-sibling::h3", match: :first) + def commits_counter + find_metric_tile("#commits") end - def deployment_frequency_counter_selector - "//p[contains(text(),'Deployment Frequency')]/preceding-sibling::h3" + def deploys_counter + find_metric_tile("#deploys") end def deployment_frequency_counter - find(:xpath, deployment_frequency_counter_selector) + find_metric_tile("#deployment-frequency") end def expect_issue_to_be_present |