diff options
| author | Gabriel Mazetto <brodock@gmail.com> | 2017-08-23 01:19:35 +0200 |
|---|---|---|
| committer | Gabriel Mazetto <brodock@gmail.com> | 2017-08-25 20:06:06 +0200 |
| commit | 8f178c4222d917b5f2878beb97642bff0ee5345e (patch) | |
| tree | f847ee3933703922b4785ec3adb969c57250cd05 /features/steps | |
| parent | ce89c425fe51d2317322350bbd8a364c08d97d21 (diff) | |
| download | gitlab-ce-8f178c4222d917b5f2878beb97642bff0ee5345e.tar.gz | |
Prevent new / renamed project from using a repository path that already exists on disk
There are some redundancies in the validation steps, and that is to
preserve current error messages behavior
Also few specs have to be changed in order to fix madness in validation
logic.
Diffstat (limited to 'features/steps')
| -rw-r--r-- | features/steps/shared/group.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/features/steps/shared/group.rb b/features/steps/shared/group.rb index de119f2c6c0..03bc7e798e0 100644 --- a/features/steps/shared/group.rb +++ b/features/steps/shared/group.rb @@ -36,14 +36,12 @@ module SharedGroup protected def is_member_of(username, groupname, role) - @project_count ||= 0 user = User.find_by(name: username) || create(:user, name: username) group = Group.find_by(name: groupname) || create(:group, name: groupname) group.add_user(user, role) - project ||= create(:project, :repository, namespace: group, path: "project#{@project_count}") + project ||= create(:project, :repository, namespace: group) create(:closed_issue_event, project: project) project.team << [user, :master] - @project_count += 1 end def owned_group |