Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 3 deletions

diff --git a/spec/features/admin/admin_browses_logs_spec.rb b/spec/features/admin/admin_browses_logs_spec.rb
index 2b97362c8e9..45e860e1536 100644
--- a/spec/features/admin/admin_browses_logs_spec.rb
+++ b/spec/features/admin/admin_browses_logs_spec.rb
@@ -10,7 +10,7 @@ describe 'Admin browses logs' do
   it 'shows available log files' do
     visit admin_logs_path
 
-    expect(page).to have_link 'application.log'
+    expect(page).to have_link 'application_json.log'
     expect(page).to have_link 'git_json.log'
     expect(page).to have_link 'test.log'
     expect(page).to have_link 'sidekiq.log'
diff --git a/spec/features/projects/services/user_activates_prometheus_spec.rb b/spec/features/projects/services/user_activates_prometheus_spec.rb
index a83d3e2e8be..ab372d532aa 100644
--- a/spec/features/projects/services/user_activates_prometheus_spec.rb
+++ b/spec/features/projects/services/user_activates_prometheus_spec.rb
@@ -15,11 +15,12 @@ describe 'User activates Prometheus' do
     click_link('Prometheus')
   end
 
-  it 'activates service' do
+  it 'does not activate service and informs about deprecation' do
     check('Active')
     fill_in('API URL', with: 'http://prometheus.example.com')
     click_button('Save changes')
 
-    expect(page).to have_content('Prometheus activated.')
+    expect(page).not_to have_content('Prometheus activated.')
+    expect(page).to have_content('Fields on this page has been deprecated.')
   end
 end