Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/views')
-rw-r--r--spec/views/admin/application_settings/_jira_connect.html.haml_spec.rb23
-rw-r--r--spec/views/admin/application_settings/general.html.haml_spec.rb10
-rw-r--r--spec/views/admin/dashboard/index.html.haml_spec.rb2
-rw-r--r--spec/views/devise/confirmations/almost_there.html.haml_spec.rb37
-rw-r--r--spec/views/events/event/_common.html.haml_spec.rb17
-rw-r--r--spec/views/groups/observability.html.haml_spec.rb18
-rw-r--r--spec/views/groups/observability/observability.html.haml_spec.rb18
-rw-r--r--spec/views/layouts/header/_gitlab_version.html.haml_spec.rb17
-rw-r--r--spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb18
-rw-r--r--spec/views/projects/artifacts/_artifact.html.haml_spec.rb85
-rw-r--r--spec/views/projects/commit/_commit_box.html.haml_spec.rb2
-rw-r--r--spec/views/projects/commit/show.html.haml_spec.rb8
-rw-r--r--spec/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml_spec.rb4
-rw-r--r--spec/views/projects/merge_requests/_commits.html.haml_spec.rb12
-rw-r--r--spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb13
-rw-r--r--spec/views/projects/merge_requests/edit.html.haml_spec.rb4
-rw-r--r--spec/views/search/show.html.haml_spec.rb10
-rw-r--r--spec/views/shared/access_tokens/_table.html.haml_spec.rb151
-rw-r--r--spec/views/shared/deploy_tokens/_form.html.haml_spec.rb62
-rw-r--r--spec/views/shared/issuable/_sidebar.html.haml_spec.rb6
20 files changed, 136 insertions, 381 deletions
diff --git a/spec/views/admin/application_settings/_jira_connect.html.haml_spec.rb b/spec/views/admin/application_settings/_jira_connect.html.haml_spec.rb
new file mode 100644
index 00000000000..7cfc2db5a41
--- /dev/null
+++ b/spec/views/admin/application_settings/_jira_connect.html.haml_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'admin/application_settings/_jira_connect.html.haml' do
+ let_it_be(:admin) { create(:admin) }
+ let(:application_setting) { build(:application_setting) }
+
+ before do
+ assign(:application_setting, application_setting)
+ allow(view).to receive(:expanded).and_return(true)
+ end
+
+ it 'renders the application ID field' do
+ render
+ expect(rendered).to have_field('Jira Connect Application ID', type: 'text')
+ end
+
+ it 'renders the asymmetric jwt cdn url field' do
+ render
+ expect(rendered).to have_field('Jira Connect Proxy URL', type: 'text')
+ end
+end
diff --git a/spec/views/admin/application_settings/general.html.haml_spec.rb b/spec/views/admin/application_settings/general.html.haml_spec.rb
index c7d156cde39..a8c7bec36e3 100644
--- a/spec/views/admin/application_settings/general.html.haml_spec.rb
+++ b/spec/views/admin/application_settings/general.html.haml_spec.rb
@@ -69,19 +69,19 @@ RSpec.describe 'admin/application_settings/general.html.haml' do
end
end
- describe 'jira connect application key' do
- it 'shows the jira connect application key section' do
+ describe 'jira connect settings' do
+ it 'shows the jira connect settings section' do
render
expect(rendered).to have_css('#js-jira_connect-settings')
end
- context 'when the jira_connect_oauth feature flag is disabled' do
+ context 'when the jira_connect_oauth_self_managed_setting feature flag is disabled' do
before do
- stub_feature_flags(jira_connect_oauth: false)
+ stub_feature_flags(jira_connect_oauth_self_managed_setting: false)
end
- it 'does not show the jira connect application key section' do
+ it 'does not show the jira connect settings section' do
render
expect(rendered).not_to have_css('#js-jira_connect-settings')
diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb
index 9f1ff960444..6e06af92232 100644
--- a/spec/views/admin/dashboard/index.html.haml_spec.rb
+++ b/spec/views/admin/dashboard/index.html.haml_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe 'admin/dashboard/index.html.haml' do
end
it 'renders the version check badge' do
- expect(rendered).to have_selector('.js-gitlab-version-check')
+ expect(rendered).to have_selector('.js-gitlab-version-check-badge')
end
end
diff --git a/spec/views/devise/confirmations/almost_there.html.haml_spec.rb b/spec/views/devise/confirmations/almost_there.html.haml_spec.rb
new file mode 100644
index 00000000000..c091efe9295
--- /dev/null
+++ b/spec/views/devise/confirmations/almost_there.html.haml_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'devise/confirmations/almost_there' do
+ describe 'confirmations text' do
+ subject { render(template: 'devise/confirmations/almost_there') }
+
+ before do
+ allow(view).to receive(:params).and_return(email: email)
+ end
+
+ context 'when correct email' do
+ let(:email) { 'こんにちは@test' }
+
+ specify do
+ subject
+
+ expect(rendered).to have_content(
+ "Please check your email (#{email}) to confirm your account"
+ )
+ end
+ end
+
+ context 'when random text' do
+ let(:email) { 'random text' }
+
+ specify do
+ subject
+
+ expect(rendered).to have_content(
+ 'Please check your email to confirm your account'
+ )
+ end
+ end
+ end
+end
diff --git a/spec/views/events/event/_common.html.haml_spec.rb b/spec/views/events/event/_common.html.haml_spec.rb
index ad8e5c2ef77..2160245fb63 100644
--- a/spec/views/events/event/_common.html.haml_spec.rb
+++ b/spec/views/events/event/_common.html.haml_spec.rb
@@ -18,9 +18,22 @@ RSpec.describe 'events/event/_common.html.haml' do
create(:event, :created, project: project, target: work_item, target_type: 'WorkItem', author: user)
end
- it 'renders the correct url' do
+ context 'when use_iid_in_work_items_path feature flag is disabled' do
+ before do
+ stub_feature_flags(use_iid_in_work_items_path: false)
+ render partial: 'events/event/common', locals: { event: event.present }
+ end
+
+ it 'renders the correct url' do
+ expect(rendered).to have_link(
+ work_item.reference_link_text, href: "/#{project.full_path}/-/work_items/#{work_item.id}"
+ )
+ end
+ end
+
+ it 'renders the correct url with iid' do
expect(rendered).to have_link(
- work_item.reference_link_text, href: "/#{project.full_path}/-/work_items/#{work_item.id}"
+ work_item.reference_link_text, href: "/#{project.full_path}/-/work_items/#{work_item.iid}?iid_path=true"
)
end
diff --git a/spec/views/groups/observability.html.haml_spec.rb b/spec/views/groups/observability.html.haml_spec.rb
deleted file mode 100644
index db280d5a2ba..00000000000
--- a/spec/views/groups/observability.html.haml_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'groups/observability/index' do
- let_it_be(:iframe_url) { "foo.test" }
-
- before do
- assign(:observability_iframe_src, iframe_url)
- end
-
- it 'renders as expected' do
- render
- page = Capybara.string(rendered)
- iframe = page.find('iframe#observability-ui-iframe')
- expect(iframe['src']).to eq(iframe_url)
- end
-end
diff --git a/spec/views/groups/observability/observability.html.haml_spec.rb b/spec/views/groups/observability/observability.html.haml_spec.rb
new file mode 100644
index 00000000000..0561737cb39
--- /dev/null
+++ b/spec/views/groups/observability/observability.html.haml_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'groups/observability/observability.html.haml' do
+ let(:iframe_url) { "foo.test" }
+
+ before do
+ allow(view).to receive(:observability_iframe_src).and_return(iframe_url)
+ end
+
+ it 'renders as expected' do
+ render
+ page = Capybara.string(rendered)
+ div = page.find('#js-observability-app')
+ expect(div['data-observability-iframe-src']).to eq(iframe_url)
+ end
+end
diff --git a/spec/views/layouts/header/_gitlab_version.html.haml_spec.rb b/spec/views/layouts/header/_gitlab_version.html.haml_spec.rb
index 2f423c72ca6..4f1dcf54216 100644
--- a/spec/views/layouts/header/_gitlab_version.html.haml_spec.rb
+++ b/spec/views/layouts/header/_gitlab_version.html.haml_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe 'layouts/header/_gitlab_version' do
end
it 'renders the version check badge' do
- expect(rendered).to have_selector('.js-gitlab-version-check')
+ expect(rendered).to have_selector('.js-gitlab-version-check-badge')
end
it 'renders the container as a link' do
@@ -18,5 +18,20 @@ RSpec.describe 'layouts/header/_gitlab_version' do
'a[data-testid="gitlab-version-container"][href="/help/update/index"]'
)
end
+
+ it 'renders the container with correct data-tracking attributes' do
+ expect(rendered).to have_selector(
+ 'a[data-testid="gitlab-version-container"][data-track-action="click_link"]'
+ )
+
+ expect(rendered).to have_selector(
+ 'a[data-testid="gitlab-version-container"][data-track-label="version_help_dropdown"]'
+ )
+
+ expect(rendered).to have_selector(
+ 'a[data-testid="gitlab-version-container"]' \
+ "[data-track-property=\"#{Gitlab.version_info.major}.#{Gitlab.version_info.minor}\"]"
+ )
+ end
end
end
diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
index e7d9a8a4708..d0d220fed66 100644
--- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
@@ -472,24 +472,6 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
end
end
end
-
- describe 'Product Analytics' do
- it 'has a link to the product analytics page' do
- render
-
- expect(rendered).to have_link('Product Analytics', href: project_product_analytics_path(project))
- end
-
- describe 'when feature flag :product_analytics is disabled' do
- it 'does not have a link to the feature flags page' do
- stub_feature_flags(product_analytics: false)
-
- render
-
- expect(rendered).not_to have_link('Product Analytics')
- end
- end
- end
end
describe 'Infrastructure' do
diff --git a/spec/views/projects/artifacts/_artifact.html.haml_spec.rb b/spec/views/projects/artifacts/_artifact.html.haml_spec.rb
deleted file mode 100644
index 5d930d6b0f2..00000000000
--- a/spec/views/projects/artifacts/_artifact.html.haml_spec.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe "projects/artifacts/_artifact.html.haml" do
- let(:project) { create(:project) }
-
- describe 'delete button' do
- before do
- create(:ci_build, :artifacts, project: project)
-
- allow(view).to receive(:current_user).and_return(user)
- assign(:project, project)
- end
-
- context 'with admin' do
- let(:user) { build(:admin) }
-
- context 'when admin mode is enabled', :enable_admin_mode do
- it 'has a delete button' do
- render_partial
-
- expect(rendered).to have_link('Delete artifacts', href: project_artifact_path(project, project.job_artifacts.first))
- end
- end
-
- context 'when admin mode is disabled' do
- it 'has no delete button' do
- project.add_reporter(user)
- render_partial
-
- expect(rendered).not_to have_link('Delete artifacts')
- end
- end
- end
-
- context 'with owner' do
- let(:user) { create(:user) }
- let(:project) { build(:project, namespace: user.namespace) }
-
- it 'has a delete button' do
- render_partial
-
- expect(rendered).to have_link('Delete artifacts', href: project_artifact_path(project, project.job_artifacts.first))
- end
- end
-
- context 'with master' do
- let(:user) { create(:user) }
-
- it 'has a delete button' do
- allow_any_instance_of(ProjectTeam).to receive(:max_member_access).and_return(Gitlab::Access::MAINTAINER)
- render_partial
-
- expect(rendered).to have_link('Delete artifacts', href: project_artifact_path(project, project.job_artifacts.first))
- end
- end
-
- context 'with developer' do
- let(:user) { build(:user) }
-
- it 'has no delete button' do
- project.add_developer(user)
- render_partial
-
- expect(rendered).not_to have_link('Delete artifacts')
- end
- end
-
- context 'with reporter' do
- let(:user) { build(:user) }
-
- it 'has no delete button' do
- project.add_reporter(user)
- render_partial
-
- expect(rendered).not_to have_link('Delete artifacts')
- end
- end
- end
-
- def render_partial
- render partial: 'projects/artifacts/artifact', collection: project.job_artifacts, as: :artifact
- end
-end
diff --git a/spec/views/projects/commit/_commit_box.html.haml_spec.rb b/spec/views/projects/commit/_commit_box.html.haml_spec.rb
index c503e085d02..4335a0901ae 100644
--- a/spec/views/projects/commit/_commit_box.html.haml_spec.rb
+++ b/spec/views/projects/commit/_commit_box.html.haml_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe 'projects/commit/_commit_box.html.haml' do
it 'shows the commit SHA' do
render
- expect(rendered).to have_text("#{Commit.truncate_sha(project.commit.sha)}")
+ expect(rendered).to have_text(Commit.truncate_sha(project.commit.sha).to_s)
end
context 'when there is a pipeline present' do
diff --git a/spec/views/projects/commit/show.html.haml_spec.rb b/spec/views/projects/commit/show.html.haml_spec.rb
index 59182f6e757..4d5c987ce37 100644
--- a/spec/views/projects/commit/show.html.haml_spec.rb
+++ b/spec/views/projects/commit/show.html.haml_spec.rb
@@ -67,5 +67,13 @@ RSpec.describe 'projects/commit/show.html.haml' do
expect(rendered).to have_content("This commit is part of merge request")
expect(rendered).to have_link(merge_request.to_reference, href: merge_request_url)
end
+
+ context 'when merge request is nil' do
+ let(:merge_request) { nil }
+
+ it 'renders the page' do
+ expect { rendered }.not_to raise_error
+ end
+ end
end
end
diff --git a/spec/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml_spec.rb b/spec/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml_spec.rb
index 416f4253e1b..99339e956cc 100644
--- a/spec/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe 'projects/merge_requests/_close_reopen_draft_report_toggle.html.h
render
- expect(rendered).to have_css('li', class: 'js-sidebar-subscriptions-entry-point')
+ expect(rendered).to have_css('li', class: 'js-sidebar-subscriptions-widget-root')
end
end
@@ -27,7 +27,7 @@ RSpec.describe 'projects/merge_requests/_close_reopen_draft_report_toggle.html.h
it 'is not present' do
render
- expect(rendered).not_to have_css('li', class: 'js-sidebar-subscriptions-entry-point')
+ expect(rendered).not_to have_css('li', class: 'js-sidebar-subscriptions-widget-root')
end
end
end
diff --git a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb
index f0273c1716f..90ee6638142 100644
--- a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb
@@ -39,16 +39,4 @@ RSpec.describe 'projects/merge_requests/_commits.html.haml', :sidekiq_might_not_
expect(rendered).to have_css('.gpg-status-box')
end
-
- context 'when there are hidden commits' do
- before do
- assign(:hidden_commit_count, 1)
- end
-
- it 'shows notice about omitted commits' do
- render
-
- expect(rendered).to match(/1 additional commit has been omitted to prevent performance issues/)
- end
- end
end
diff --git a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb
index 038a94fe7c3..feb82e6a2b2 100644
--- a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb
@@ -35,17 +35,4 @@ RSpec.describe 'projects/merge_requests/creations/_new_submit.html.haml' do
expect(rendered).not_to have_text('Builds')
end
end
-
- context 'when there are hidden commits' do
- before do
- assign(:pipelines, Ci::Pipeline.none)
- assign(:hidden_commit_count, 2)
- end
-
- it 'shows notice about omitted commits' do
- render
-
- expect(rendered).to match(/2 additional commits have been omitted to prevent performance issues/)
- end
- end
end
diff --git a/spec/views/projects/merge_requests/edit.html.haml_spec.rb b/spec/views/projects/merge_requests/edit.html.haml_spec.rb
index 215d404e395..75956160c0a 100644
--- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe 'projects/merge_requests/edit.html.haml' do
expect(rendered).to have_field('merge_request[title]')
expect(rendered).to have_field('merge_request[description]')
expect(rendered).to have_selector('input[name="merge_request[label_ids][]"]', visible: false)
- expect(rendered).to have_selector('#merge_request_milestone_id', visible: false)
+ expect(rendered).to have_selector('.js-milestone-dropdown-root')
expect(rendered).not_to have_selector('#merge_request_target_branch', visible: false)
end
end
@@ -57,7 +57,7 @@ RSpec.describe 'projects/merge_requests/edit.html.haml' do
expect(rendered).to have_field('merge_request[title]')
expect(rendered).to have_field('merge_request[description]')
expect(rendered).to have_selector('input[name="merge_request[label_ids][]"]', visible: false)
- expect(rendered).to have_selector('#merge_request_milestone_id', visible: false)
+ expect(rendered).to have_selector('.js-milestone-dropdown-root')
expect(rendered).to have_selector('#merge_request_target_branch', visible: false)
end
end
diff --git a/spec/views/search/show.html.haml_spec.rb b/spec/views/search/show.html.haml_spec.rb
index 565dadd64fe..5f9c6c65a08 100644
--- a/spec/views/search/show.html.haml_spec.rb
+++ b/spec/views/search/show.html.haml_spec.rb
@@ -11,10 +11,10 @@ RSpec.describe 'search/show' do
stub_template "search/_results.html.haml" => 'Results Partial'
end
- context 'feature flag enabled' do
+ context 'search_page_vertical_nav feature flag enabled' do
before do
- allow(self).to receive(:current_user).and_return(user)
- @search_term = search_term
+ allow(view).to receive(:current_user) { user }
+ assign(:search_term, search_term)
render
end
@@ -29,11 +29,11 @@ RSpec.describe 'search/show' do
end
end
- context 'feature flag disabled' do
+ context 'search_page_vertical_nav feature flag disabled' do
before do
stub_feature_flags(search_page_vertical_nav: false)
- @search_term = search_term
+ assign(:search_term, search_term)
render
end
diff --git a/spec/views/shared/access_tokens/_table.html.haml_spec.rb b/spec/views/shared/access_tokens/_table.html.haml_spec.rb
deleted file mode 100644
index 74de9e12d04..00000000000
--- a/spec/views/shared/access_tokens/_table.html.haml_spec.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'shared/access_tokens/_table.html.haml' do
- let(:type) { 'token' }
- let(:type_plural) { 'tokens' }
- let(:empty_message) { nil }
- let(:impersonation) { false }
-
- let_it_be(:user) { create(:user) }
- let_it_be(:tokens) { [create(:personal_access_token, user: user)] }
- let_it_be(:resource) { false }
-
- before do
- if resource
- resource.add_maintainer(user)
- end
-
- # Forcibly removing scopes from one token as it's not possible to do with the current modal on creation
- # But the check exists in the template (it may be there for legacy reasons), so we should test the outcome
- if tokens.size > 1
- tokens[1].scopes = []
- end
-
- locals = {
- type: type,
- type_plural: type_plural,
- active_tokens: tokens,
- resource: resource,
- impersonation: impersonation,
- revoke_route_helper: ->(token) { 'path/' }
- }
-
- if empty_message
- locals[:no_active_tokens_message] = empty_message
- end
-
- render partial: 'shared/access_tokens/table', locals: locals
- end
-
- context 'if personal' do
- it 'does not show non-personal content', :aggregate_failures do
- expect(rendered).not_to have_content 'To see all the user\'s personal access tokens you must impersonate them first.'
- expect(rendered).not_to have_selector 'th', text: 'Role'
- end
- end
-
- context 'if impersonation' do
- let(:impersonation) { true }
-
- it 'shows the impersonation content', :aggregate_failures do
- expect(rendered).to have_content 'To see all the user\'s personal access tokens you must impersonate them first.'
-
- expect(rendered).not_to have_content 'Personal access tokens are not revoked upon expiration.'
- expect(rendered).not_to have_selector 'th', text: 'Role'
- end
- end
-
- context 'if resource is project' do
- let_it_be(:resource) { create(:project) }
-
- it 'shows the project content', :aggregate_failures do
- expect(rendered).to have_selector 'th', text: 'Role'
- expect(rendered).to have_selector 'td', text: 'Maintainer'
-
- expect(rendered).not_to have_content 'Personal access tokens are not revoked upon expiration.'
- expect(rendered).not_to have_content 'To see all the user\'s personal access tokens you must impersonate them first.'
- end
- end
-
- context 'if resource is group' do
- let_it_be(:resource) { create(:group) }
-
- it 'shows the group content', :aggregate_failures do
- expect(rendered).to have_selector 'th', text: 'Role'
- expect(rendered).to have_selector 'td', text: 'Maintainer'
-
- expect(rendered).not_to have_content 'Personal access tokens are not revoked upon expiration.'
- expect(rendered).not_to have_content 'To see all the user\'s personal access tokens you must impersonate them first.'
- end
- end
-
- context 'without tokens' do
- let_it_be(:tokens) { [] }
-
- it 'has the correct content', :aggregate_failures do
- expect(rendered).to have_content 'Active tokens (0)'
- expect(rendered).to have_content 'This user has no active tokens.'
- end
-
- context 'with a custom empty text' do
- let(:empty_message) { 'Custom empty message' }
-
- it 'shows the custom empty text' do
- expect(rendered).to have_content empty_message
- end
- end
- end
-
- context 'with tokens' do
- let_it_be(:tokens) do
- [
- create(:personal_access_token, user: user, name: 'Access token', last_used_at: 4.days.from_now, expires_at: nil, scopes: [:read_api, :read_user]),
- create(:personal_access_token, user: user, expires_at: 1.day.from_now, scopes: [:read_api, :read_user])
- ]
- end
-
- let_it_be(:expired_token) { build(:personal_access_token, name: "Expired token", expires_at: 2.days.ago).tap { |t| t.save!(validate: false) } }
-
- it 'has the correct content', :aggregate_failures do
- # Heading content
- expect(rendered).to have_content 'Active tokens (2)'
-
- # Table headers
- expect(rendered).to have_selector 'th', text: 'Token name'
- expect(rendered).to have_selector 'th', text: 'Scopes'
- expect(rendered).to have_selector 'th', text: 'Created'
- expect(rendered).to have_selector 'th', text: 'Last Used'
- expect(rendered).to have_selector 'th', text: 'Expires'
-
- # Table contents
- expect(rendered).to have_content 'Access token'
- expect(rendered).not_to have_content 'Expired token'
- expect(rendered).to have_content 'read_api, read_user'
- expect(rendered).to have_content 'no scopes selected'
- expect(rendered).to have_content Time.now.to_date.to_s(:medium)
- expect(rendered).to have_content l(4.days.from_now, format: "%b %d, %Y")
-
- # Revoke buttons
- expect(rendered).to have_link 'Revoke', href: 'path/', class: 'btn-danger-secondary', count: 1
- expect(rendered).to have_link 'Revoke', href: 'path/', count: 2
- end
-
- context 'without the last used time' do
- let_it_be(:tokens) { [create(:personal_access_token, user: user, expires_at: 5.days.ago)] }
-
- it 'shows the last used empty text' do
- expect(rendered).to have_content 'Never'
- end
- end
-
- context 'without expired at' do
- let_it_be(:tokens) { [create(:personal_access_token, user: user, expires_at: nil, last_used_at: 1.day.ago)] }
-
- it 'shows the expired at empty text' do
- expect(rendered).to have_content 'Never'
- end
- end
- end
-end
diff --git a/spec/views/shared/deploy_tokens/_form.html.haml_spec.rb b/spec/views/shared/deploy_tokens/_form.html.haml_spec.rb
deleted file mode 100644
index 74ad0ccb77a..00000000000
--- a/spec/views/shared/deploy_tokens/_form.html.haml_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'shared/deploy_tokens/_form.html.haml' do
- using RSpec::Parameterized::TableSyntax
-
- let_it_be(:user) { create(:user) }
- let_it_be(:token) { build(:deploy_token) }
-
- RSpec.shared_examples "display deploy token settings" do |role, shows_package_registry_permissions|
- before do
- subject.add_member(user, role)
- allow(view).to receive(:current_user).and_return(user)
- stub_config(packages: { enabled: packages_enabled })
- end
-
- it "correctly renders the form" do
- render 'shared/deploy_tokens/form', token: token, group_or_project: subject
-
- if shows_package_registry_permissions
- expect(rendered).to have_content('Allows read-only access to the package registry.')
- else
- expect(rendered).not_to have_content('Allows read-only access to the package registry.')
- end
- end
- end
-
- context "when the subject is a project" do
- let_it_be(:subject, refind: true) { create(:project, :private) }
-
- where(:packages_enabled, :feature_enabled, :role, :shows_package_registry_permissions) do
- true | true | :maintainer | true
- false | true | :maintainer | false
- true | false | :maintainer | false
- false | false | :maintainer | false
- end
-
- with_them do
- before do
- subject.update!(packages_enabled: feature_enabled)
- end
-
- it_behaves_like 'display deploy token settings', params[:role], params[:shows_package_registry_permissions]
- end
- end
-
- context "when the subject is a group" do
- let_it_be(:subject, refind: true) { create(:group, :private) }
-
- where(:packages_enabled, :role, :shows_package_registry_permissions) do
- true | :owner | true
- false | :owner | false
- true | :maintainer | true
- false | :maintainer | false
- end
-
- with_them do
- it_behaves_like 'display deploy token settings', params[:role], params[:shows_package_registry_permissions]
- end
- end
-end
diff --git a/spec/views/shared/issuable/_sidebar.html.haml_spec.rb b/spec/views/shared/issuable/_sidebar.html.haml_spec.rb
index 43a723dbb2c..31f79c25073 100644
--- a/spec/views/shared/issuable/_sidebar.html.haml_spec.rb
+++ b/spec/views/shared/issuable/_sidebar.html.haml_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe 'shared/issuable/_sidebar.html.haml' do
it 'is expected not to be shown' do
create(:contact, group: group)
- expect(rendered).not_to have_css('#js-issue-crm-contacts')
+ expect(rendered).not_to have_css('.js-sidebar-crm-contacts-root')
end
end
@@ -51,7 +51,7 @@ RSpec.describe 'shared/issuable/_sidebar.html.haml' do
it 'is expected not to be shown' do
group.add_developer(user)
- expect(rendered).not_to have_css('#js-issue-crm-contacts')
+ expect(rendered).not_to have_css('.js-sidebar-crm-contacts-root')
end
end
@@ -60,7 +60,7 @@ RSpec.describe 'shared/issuable/_sidebar.html.haml' do
create(:contact, group: group)
group.add_developer(user)
- expect(rendered).to have_css('#js-issue-crm-contacts')
+ expect(rendered).to have_css('.js-sidebar-crm-contacts-root')
end
end
end