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/controllers/admin')
-rw-r--r--spec/controllers/admin/integrations_controller_spec.rb9
-rw-r--r--spec/controllers/admin/runners_controller_spec.rb24
-rw-r--r--spec/controllers/admin/users_controller_spec.rb11
3 files changed, 40 insertions, 4 deletions
diff --git a/spec/controllers/admin/integrations_controller_spec.rb b/spec/controllers/admin/integrations_controller_spec.rb
index 8e48ecddd0f..817223bd91a 100644
--- a/spec/controllers/admin/integrations_controller_spec.rb
+++ b/spec/controllers/admin/integrations_controller_spec.rb
@@ -49,11 +49,12 @@ describe Admin::IntegrationsController do
end
context 'invalid params' do
- let(:url) { 'https://jira.localhost' }
+ let(:url) { 'invalid' }
- it 'updates the integration' do
- expect(response).to have_gitlab_http_status(:found)
- expect(integration.reload.url).to eq(url)
+ it 'does not update the integration' do
+ expect(response).to have_gitlab_http_status(:ok)
+ expect(response).to render_template(:edit)
+ expect(integration.reload.url).not_to eq(url)
end
end
end
diff --git a/spec/controllers/admin/runners_controller_spec.rb b/spec/controllers/admin/runners_controller_spec.rb
index 7582006df36..803fcf90135 100644
--- a/spec/controllers/admin/runners_controller_spec.rb
+++ b/spec/controllers/admin/runners_controller_spec.rb
@@ -72,6 +72,30 @@ describe Admin::RunnersController do
expect(response).to have_gitlab_http_status(:ok)
end
+
+ describe 'Cost factors values' do
+ context 'when it is Gitlab.com' do
+ before do
+ expect(Gitlab).to receive(:com?).at_least(:once) { true }
+ end
+
+ it 'renders cost factors fields' do
+ get :show, params: { id: runner.id }
+
+ expect(response.body).to match /Private projects Minutes cost factor/
+ expect(response.body).to match /Public projects Minutes cost factor/
+ end
+ end
+
+ context 'when it is not Gitlab.com' do
+ it 'does not show cost factor fields' do
+ get :show, params: { id: runner.id }
+
+ expect(response.body).not_to match /Private projects Minutes cost factor/
+ expect(response.body).not_to match /Public projects Minutes cost factor/
+ end
+ end
+ end
end
describe '#update' do
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index a4ce510b413..387fc0407b6 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -340,6 +340,17 @@ describe Admin::UsersController do
end
end
+ describe "DELETE #remove_email" do
+ it 'deletes the email' do
+ email = create(:email, user: user)
+
+ delete :remove_email, params: { id: user.username, email_id: email.id }
+
+ expect(user.reload.emails).not_to include(email)
+ expect(flash[:notice]).to eq('Successfully removed email.')
+ end
+ end
+
describe "POST impersonate" do
context "when the user is blocked" do
before do