diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
| commit | 35659da185e3c6ec2862884b4e9e19dd20445957 (patch) | |
| tree | 4ce78341a0a0ea1c14249d41f70a060a5d39cc22 /spec/features/task_lists_spec.rb | |
| parent | 1405bf844831bbaf8a7ffb1c516906b858bfdbb6 (diff) | |
| parent | fe09c25d68a61c5874e9beb0f018c05a4d789d70 (diff) | |
| download | gitlab-ce-35659da185e3c6ec2862884b4e9e19dd20445957.tar.gz | |
Merge branch 'master' into 'fix-btn-alignment'fix-btn-alignment
# Conflicts:
# app/views/projects/merge_requests/_nav_btns.html.haml
Diffstat (limited to 'spec/features/task_lists_spec.rb')
| -rw-r--r-- | spec/features/task_lists_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb index c14826df55a..580258f77eb 100644 --- a/spec/features/task_lists_spec.rb +++ b/spec/features/task_lists_spec.rb @@ -52,8 +52,8 @@ feature 'Task Lists' do before do Warden.test_mode! - project.team << [user, :master] - project.team << [user2, :guest] + project.add_master(user) + project.add_guest(user2) login_as(user) end |