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/requests/api/internal')
-rw-r--r--spec/requests/api/internal/kubernetes_spec.rb9
-rw-r--r--spec/requests/api/internal/pages_spec.rb9
2 files changed, 9 insertions, 9 deletions
diff --git a/spec/requests/api/internal/kubernetes_spec.rb b/spec/requests/api/internal/kubernetes_spec.rb
index 1e8397773be..551ed0babf1 100644
--- a/spec/requests/api/internal/kubernetes_spec.rb
+++ b/spec/requests/api/internal/kubernetes_spec.rb
@@ -507,15 +507,6 @@ RSpec.describe API::Internal::Kubernetes, feature_category: :deployment_manageme
expect(response).to have_gitlab_http_status(:success)
end
- it 'returns 400 when the feature flag is disabled' do
- deployment_project.add_member(user, :developer)
- stub_feature_flags(k8s_proxy_pat: false)
-
- send_request(params: { agent_id: agent.id, access_type: 'personal_access_token', access_key: personal_access_token.token })
-
- expect(response).to have_gitlab_http_status(:bad_request)
- end
-
it 'returns 403 when user has no access' do
send_request(params: { agent_id: agent.id, access_type: 'personal_access_token', access_key: personal_access_token.token })
diff --git a/spec/requests/api/internal/pages_spec.rb b/spec/requests/api/internal/pages_spec.rb
index 65aa2326af5..1eeb3404157 100644
--- a/spec/requests/api/internal/pages_spec.rb
+++ b/spec/requests/api/internal/pages_spec.rb
@@ -69,6 +69,15 @@ RSpec.describe API::Internal::Pages, feature_category: :pages do
context 'when querying a custom domain' do
let_it_be(:pages_domain) { create(:pages_domain, domain: 'pages.io', project: project) }
+ # We need to ensure not to return the unique domain when requesting a custom domain
+ # https://gitlab.com/gitlab-org/gitlab/-/issues/426435
+ before_all do
+ project.project_setting.update!(
+ pages_unique_domain: 'unique-domain',
+ pages_unique_domain_enabled: true
+ )
+ end
+
context 'when there are no pages deployed for the related project' do
before do
project.mark_pages_as_not_deployed