diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-12 18:09:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-12 18:09:17 +0300 |
commit | d549d413bb69f87ec26661ec96287bb4b25c32ff (patch) | |
tree | ac50717d0e3db25fd64bd36c1090496c42b24556 /spec/features | |
parent | 1caab68312013cae5083460ec8e03796daef9341 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/groups/navbar_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/issues/group_label_sidebar_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/issues/user_sees_sidebar_updates_in_realtime_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/markdown/sandboxed_mermaid_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/navbar_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/protected_tags_spec.rb | 2 |
7 files changed, 11 insertions, 9 deletions
diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb index 180ccab78bc..a52e2d95fed 100644 --- a/spec/features/groups/navbar_spec.rb +++ b/spec/features/groups/navbar_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group navbar', feature_category: :navigation do +RSpec.describe 'Group navbar', :with_license, feature_category: :navigation do include NavbarStructureHelper include WikiHelpers diff --git a/spec/features/issues/group_label_sidebar_spec.rb b/spec/features/issues/group_label_sidebar_spec.rb index b26030fe8d0..41450ba3373 100644 --- a/spec/features/issues/group_label_sidebar_spec.rb +++ b/spec/features/issues/group_label_sidebar_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group label on issue', feature_category: :team_planning do +RSpec.describe 'Group label on issue', :with_license, feature_category: :team_planning do it 'renders link to the project issues page', :js do group = create(:group) project = create(:project, :public, namespace: group) diff --git a/spec/features/issues/user_sees_sidebar_updates_in_realtime_spec.rb b/spec/features/issues/user_sees_sidebar_updates_in_realtime_spec.rb index b9a25f47da9..91b18454af5 100644 --- a/spec/features/issues/user_sees_sidebar_updates_in_realtime_spec.rb +++ b/spec/features/issues/user_sees_sidebar_updates_in_realtime_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Issues > Real-time sidebar', :js, feature_category: :team_planning do +RSpec.describe 'Issues > Real-time sidebar', :js, :with_license, feature_category: :team_planning do let_it_be(:project) { create(:project, :public) } let_it_be(:issue) { create(:issue, project: project) } let_it_be(:user) { create(:user) } diff --git a/spec/features/markdown/sandboxed_mermaid_spec.rb b/spec/features/markdown/sandboxed_mermaid_spec.rb index 26b397a1fd5..0282d02d809 100644 --- a/spec/features/markdown/sandboxed_mermaid_spec.rb +++ b/spec/features/markdown/sandboxed_mermaid_spec.rb @@ -23,7 +23,7 @@ RSpec.describe 'Sandboxed Mermaid rendering', :js, feature_category: :team_plann context 'in an issue' do let(:issue) { create(:issue, project: project, description: description) } - it 'includes mermaid frame correctly' do + it 'includes mermaid frame correctly', :with_license do visit project_issue_path(project, issue) wait_for_requests diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb index d182ae1bb84..6090d132e3a 100644 --- a/spec/features/projects/navbar_spec.rb +++ b/spec/features/projects/navbar_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project navbar', feature_category: :projects do +RSpec.describe 'Project navbar', :with_license, feature_category: :projects do include NavbarStructureHelper include WaitForRequests diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index ec0b3f9d81b..84702b3a6bb 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -213,7 +213,7 @@ RSpec.describe 'Project', feature_category: :projects do end end - describe 'showing information about source of a project fork' do + describe 'showing information about source of a project fork', :js do let(:user) { create(:user) } let(:base_project) { create(:project, :public, :repository) } let(:forked_project) { fork_project(base_project, user, repository: true) } @@ -224,6 +224,7 @@ RSpec.describe 'Project', feature_category: :projects do it 'shows a link to the source project when it is available', :sidekiq_might_not_need_inline do visit project_path(forked_project) + wait_for_requests expect(page).to have_content('Forked from') expect(page).to have_link(base_project.full_name) @@ -233,6 +234,7 @@ RSpec.describe 'Project', feature_category: :projects do forked_project visit project_path(base_project) + wait_for_requests expect(page).not_to have_content('In fork network of') expect(page).not_to have_content('Forked from') @@ -243,7 +245,7 @@ RSpec.describe 'Project', feature_category: :projects do Projects::DestroyService.new(base_project, base_project.first_owner).execute visit project_path(forked_project) - + wait_for_requests expect(page).to have_content('Forked from an inaccessible project') end @@ -255,7 +257,7 @@ RSpec.describe 'Project', feature_category: :projects do Projects::DestroyService.new(forked_project, user).execute visit project_path(fork_of_fork) - + wait_for_requests expect(page).to have_content("Forked from") expect(page).to have_link(base_project.full_name) end diff --git a/spec/features/protected_tags_spec.rb b/spec/features/protected_tags_spec.rb index 1aadc7ce90a..c2058a5c345 100644 --- a/spec/features/protected_tags_spec.rb +++ b/spec/features/protected_tags_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Protected Tags', :js, feature_category: :source_code_management do +RSpec.describe 'Protected Tags', :js, :with_license, feature_category: :source_code_management do include ProtectedTagHelpers let(:project) { create(:project, :repository) } |