Put loggers in before_action for easier overriding in EEtc-test-admin-log-links

Make it easier to override the set of loggers, by putting them in a
separate method.

Also modify spec so it tests for links, instead of checking for
regular text.

2 files changed, 13 insertions, 4 deletions

diff --git a/app/controllers/admin/logs_controller.rb b/app/controllers/admin/logs_controller.rb
index bdc4332ae69..12a27cede75 100644
--- a/app/controllers/admin/logs_controller.rb
+++ b/app/controllers/admin/logs_controller.rb
@@ -1,6 +1,13 @@
 class Admin::LogsController < Admin::ApplicationController
+  before_action :loggers
+
   def show
-    @loggers = [
+  end
+
+  private
+
+  def loggers
+    @loggers ||= [
       Gitlab::AppLogger,
       Gitlab::GitLogger,
       Gitlab::EnvironmentLogger,
diff --git a/spec/features/admin/admin_browses_logs_spec.rb b/spec/features/admin/admin_browses_logs_spec.rb
index 3e3404dfdac..02f50d7e27f 100644
--- a/spec/features/admin/admin_browses_logs_spec.rb
+++ b/spec/features/admin/admin_browses_logs_spec.rb
@@ -8,8 +8,10 @@ describe 'Admin browses logs' do
   it 'shows available log files' do
     visit admin_logs_path
 
-    expect(page).to have_content 'test.log'
-    expect(page).to have_content 'githost.log'
-    expect(page).to have_content 'application.log'
+    expect(page).to have_link 'application.log'
+    expect(page).to have_link 'githost.log'
+    expect(page).to have_link 'test.log'
+    expect(page).to have_link 'sidekiq.log'
+    expect(page).to have_link 'repocheck.log'
   end
 end