Merge branch 'tc-test-admin-log-links' into 'master'

Put Admin loggers in before_action for easier overriding in EE

See merge request !14081
This commit is contained in:
Dmitriy Zaporozhets 2017-09-06 15:56:12 +00:00
commit 8a2aab447a
2 changed files with 13 additions and 4 deletions

View file

@ -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,

View file

@ -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