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:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 21:06:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 21:06:57 +0300
commit6d31b8f052d30b7e55128d17b66bceed8c6065a9 (patch)
treeca428cf6145af7cfaada94378e66bd5e7cc5a429 /spec/requests/api/settings_spec.rb
parent69944ffb68788d190e81ff7e33db5dcb6c903184 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api/settings_spec.rb')
-rw-r--r--spec/requests/api/settings_spec.rb48
1 files changed, 0 insertions, 48 deletions
diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb
index 1b58fb1dab1..c50cb4a5927 100644
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
@@ -223,54 +223,6 @@ describe API::Settings, 'Settings' do
end
end
- context "pendo tracking settings" do
- let(:settings) do
- {
- pendo_url: "https://pendo.example.com",
- pendo_enabled: true
- }
- end
-
- let(:attribute_names) { settings.keys.map(&:to_s) }
-
- it "includes the attributes in the API" do
- get api("/application/settings", admin)
-
- expect(response).to have_gitlab_http_status(200)
- attribute_names.each do |attribute|
- expect(json_response.keys).to include(attribute)
- end
- end
-
- it "allows updating the settings" do
- put api("/application/settings", admin), params: settings
-
- expect(response).to have_gitlab_http_status(200)
- settings.each do |attribute, value|
- expect(ApplicationSetting.current.public_send(attribute)).to eq(value)
- end
- end
-
- context "missing pendo_url value when pendo_enabled is true" do
- it "returns a blank parameter error message" do
- put api("/application/settings", admin), params: { pendo_enabled: true }
-
- expect(response).to have_gitlab_http_status(400)
- expect(json_response["error"]).to eq("pendo_url is missing")
- end
-
- it "handles validation errors" do
- put api("/application/settings", admin), params: settings.merge({
- pendo_url: nil
- })
-
- expect(response).to have_gitlab_http_status(400)
- message = json_response["message"]
- expect(message["pendo_url"]).to include("can't be blank")
- end
- end
- end
-
context 'EKS integration settings' do
let(:attribute_names) { settings.keys.map(&:to_s) }
let(:sensitive_attributes) { %w(eks_secret_access_key) }