diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-22 20:56:12 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-22 20:56:12 +0300 |
| commit | c31c8c55a4b805932ff24e08dc4cdacb497b1a82 (patch) | |
| tree | f4654ca2c6872015fb1346f5318c9c2d5140e18d /features/steps/shared/authentication.rb | |
| parent | fbdf34d7abc678435ab4a603e93dcc83cb89a981 (diff) | |
| parent | ef6e94e37e0fce23acf32992476aeb63405be0c1 (diff) | |
| download | gitlab-ce-c31c8c55a4b805932ff24e08dc4cdacb497b1a82.tar.gz | |
Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/markdown_render.rb
Diffstat (limited to 'features/steps/shared/authentication.rb')
| -rw-r--r-- | features/steps/shared/authentication.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/shared/authentication.rb b/features/steps/shared/authentication.rb index b48021dc146..ac8a3df6bb9 100644 --- a/features/steps/shared/authentication.rb +++ b/features/steps/shared/authentication.rb @@ -4,11 +4,11 @@ module SharedAuthentication include Spinach::DSL include LoginHelpers - Given 'I sign in as a user' do + step 'I sign in as a user' do login_as :user end - Given 'I sign in as an admin' do + step 'I sign in as an admin' do login_as :admin end |