diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-23 14:38:23 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-23 14:38:23 +0200 |
commit | 28e13634dc9318dbd093a4561ee8ea16e1d71460 (patch) | |
tree | 0a14694c45a8328fc9dbf868f310c5ba3a71184f /features/steps/shared/project.rb | |
parent | 68590fddd860c5d840d8f04314ed11f0d02ddd44 (diff) | |
parent | 573f1f4ade80cc3b66723ad12594467e881b4510 (diff) | |
download | gitlab-ce-28e13634dc9318dbd093a4561ee8ea16e1d71460.tar.gz |
Merge branch 'improve/mr_diff'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/project_fork.rb
features/steps/project/project_forked_merge_requests.rb
features/steps/project/project_issue_tracker.rb
features/steps/project/project_markdown_render.rb
features/steps/shared/project.rb
Diffstat (limited to 'features/steps/shared/project.rb')
-rw-r--r-- | features/steps/shared/project.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb index 00c289c2329..7360482d736 100644 --- a/features/steps/shared/project.rb +++ b/features/steps/shared/project.rb @@ -3,21 +3,21 @@ module SharedProject # Create a project without caring about what it's called And "I own a project" do - @project = create(:project_with_code, namespace: @user.namespace) + @project = create(:project, namespace: @user.namespace) @project.team << [@user, :master] end # Create a specific project called "Shop" And 'I own project "Shop"' do @project = Project.find_by(name: "Shop") - @project ||= create(:project_with_code, name: "Shop", namespace: @user.namespace) + @project ||= create(:project, name: "Shop", namespace: @user.namespace) @project.team << [@user, :master] end # Create another specific project called "Forum" And 'I own project "Forum"' do @project = Project.find_by(name: "Forum") - @project ||= create(:project_with_code, name: "Forum", namespace: @user.namespace, path: 'forum_project') + @project ||= create(:project, name: "Forum", namespace: @user.namespace, path: 'forum_project') @project.team << [@user, :master] end |