diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/features/projects/show | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/features/projects/show')
-rw-r--r-- | spec/features/projects/show/schema_markup_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/projects/show/user_sees_collaboration_links_spec.rb | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/spec/features/projects/show/schema_markup_spec.rb b/spec/features/projects/show/schema_markup_spec.rb index 1777b72cbf5..28803db924a 100644 --- a/spec/features/projects/show/schema_markup_spec.rb +++ b/spec/features/projects/show/schema_markup_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe 'Projects > Show > Schema Markup' do - let_it_be(:project) { create(:project, :repository, :public, :with_avatar, description: 'foobar', tag_list: 'tag1, tag2') } + let_it_be(:project) { create(:project, :repository, :public, :with_avatar, description: 'foobar', topic_list: 'topic1, topic2') } it 'shows SoftwareSourceCode structured markup', :js do visit project_path(project) @@ -16,7 +16,7 @@ RSpec.describe 'Projects > Show > Schema Markup' do expect(page).to have_selector('[itemprop="identifier"]', text: "Project ID: #{project.id}") expect(page).to have_selector('[itemprop="description"]', text: project.description) expect(page).to have_selector('[itemprop="license"]', text: project.repository.license.name) - expect(find_all('[itemprop="keywords"]').map(&:text)).to match_array(project.tag_list.map(&:capitalize)) + expect(find_all('[itemprop="keywords"]').map(&:text)).to match_array(project.topic_list.map(&:capitalize)) expect(page).to have_selector('[itemprop="about"]') end end diff --git a/spec/features/projects/show/user_sees_collaboration_links_spec.rb b/spec/features/projects/show/user_sees_collaboration_links_spec.rb index ffdfbb9fe81..613033373e8 100644 --- a/spec/features/projects/show/user_sees_collaboration_links_spec.rb +++ b/spec/features/projects/show/user_sees_collaboration_links_spec.rb @@ -12,6 +12,10 @@ RSpec.describe 'Projects > Show > Collaboration links', :js do sign_in(user) end + def find_new_menu_toggle + find('#js-onboarding-new-project-link') + end + context 'with developer user' do before do project.add_developer(user) @@ -22,7 +26,7 @@ RSpec.describe 'Projects > Show > Collaboration links', :js do # The navigation bar page.within('.header-new') do - find('.qa-new-menu-toggle').click + find_new_menu_toggle.click aggregate_failures 'dropdown links in the navigation bar' do expect(page).to have_link('New issue') @@ -30,7 +34,7 @@ RSpec.describe 'Projects > Show > Collaboration links', :js do expect(page).to have_link('New snippet', href: new_project_snippet_path(project)) end - find('.qa-new-menu-toggle').click + find_new_menu_toggle.click end # The dropdown above the tree @@ -56,7 +60,7 @@ RSpec.describe 'Projects > Show > Collaboration links', :js do visit project_path(project) page.within('.header-new') do - find('.qa-new-menu-toggle').click + find_new_menu_toggle.click aggregate_failures 'dropdown links' do expect(page).not_to have_link('New issue') @@ -64,7 +68,7 @@ RSpec.describe 'Projects > Show > Collaboration links', :js do expect(page).not_to have_link('New snippet', href: new_project_snippet_path(project)) end - find('.qa-new-menu-toggle').click + find_new_menu_toggle.click end expect(page).not_to have_selector('.qa-add-to-tree') |