cleanup wip

This commit is contained in:
Pawel Chojnacki 2017-06-16 16:53:02 +02:00
parent b97d5b65dd
commit 64bb0d37d4
3 changed files with 9 additions and 6 deletions

View File

@ -42,6 +42,7 @@ describe Projects::DeploymentsController do
before do
allow(controller).to receive(:deployment).and_return(deployment)
end
context 'when metrics are disabled' do
before do
allow(deployment).to receive(:has_metrics?).and_return false
@ -114,6 +115,7 @@ describe Projects::DeploymentsController do
before do
allow(controller).to receive(:deployment).and_return(deployment)
end
context 'when metrics are disabled' do
before do
allow(deployment).to receive(:has_metrics?).and_return false

View File

@ -338,11 +338,13 @@ describe Projects::EnvironmentsController do
context 'when environment has some metrics' do
before do
expect(environment).to receive(:additional_metrics).and_return({
success: true,
data: {},
last_update: 42
})
expect(environment)
.to receive(:additional_metrics)
.and_return({
success: true,
data: {},
last_update: 42
})
end
it 'returns a metrics JSON document' do

View File

@ -8,7 +8,6 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
let(:project) { create(:project_empty_repo, namespace: namespace, path: 'services-project') }
let!(:service) { create(:prometheus_service, project: project) }
render_views
before(:all) do