diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-07 11:47:14 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-07 11:47:14 +0000 |
| commit | 0fc1e9a8e00926ba2c65f38a68ffd4e21c5844ba (patch) | |
| tree | 504593db341b35397475b3e6dee9337bb51ecf85 | |
| parent | 9e5d9f017968eafc6e68721e05722a0876bdda39 (diff) | |
| parent | e16bc50d363fe65bbceb8aed39a0e19ec91b3329 (diff) | |
| download | gitlab-ce-0fc1e9a8e00926ba2c65f38a68ffd4e21c5844ba.tar.gz | |
Merge branch 'move-admin-logs-spinach-test-to-rspec' into 'master'
Move admin logs spinach test to RSpec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
See merge request !7945
| -rw-r--r-- | changelogs/unreleased/move-admin-logs-spinach-test-to-rspec.yml | 4 | ||||
| -rw-r--r-- | features/admin/logs.feature | 8 | ||||
| -rw-r--r-- | features/steps/admin/logs.rb | 11 | ||||
| -rw-r--r-- | spec/features/admin/admin_browses_logs_spec.rb | 15 |
4 files changed, 19 insertions, 19 deletions
diff --git a/changelogs/unreleased/move-admin-logs-spinach-test-to-rspec.yml b/changelogs/unreleased/move-admin-logs-spinach-test-to-rspec.yml new file mode 100644 index 00000000000..696aa8510a0 --- /dev/null +++ b/changelogs/unreleased/move-admin-logs-spinach-test-to-rspec.yml @@ -0,0 +1,4 @@ +--- +title: Move admin logs spinach test to rspec +merge_request: 7945 +author: Semyon Pupkov diff --git a/features/admin/logs.feature b/features/admin/logs.feature deleted file mode 100644 index ceb3bc34927..00000000000 --- a/features/admin/logs.feature +++ /dev/null @@ -1,8 +0,0 @@ -@admin -Feature: Admin Logs - Background: - Given I sign in as an admin - - Scenario: On Admin Logs - Given I visit admin logs page - Then I should see tabs with available logs diff --git a/features/steps/admin/logs.rb b/features/steps/admin/logs.rb deleted file mode 100644 index 63881d69146..00000000000 --- a/features/steps/admin/logs.rb +++ /dev/null @@ -1,11 +0,0 @@ -class Spinach::Features::AdminLogs < Spinach::FeatureSteps - include SharedAuthentication - include SharedPaths - include SharedAdmin - - step 'I should see tabs with available logs' do - expect(page).to have_content 'test.log' - expect(page).to have_content 'githost.log' - expect(page).to have_content 'application.log' - end -end diff --git a/spec/features/admin/admin_browses_logs_spec.rb b/spec/features/admin/admin_browses_logs_spec.rb new file mode 100644 index 00000000000..d880f3f07db --- /dev/null +++ b/spec/features/admin/admin_browses_logs_spec.rb @@ -0,0 +1,15 @@ +require 'spec_helper' + +describe 'Admin browses logs' do + before do + login_as :admin + end + + 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' + end +end |