Download as
Browse Code »

Commit c227aa44f9c54dd88f2ac8de7a3463a23f516dff

Authored by Dmitriy Zaporozhets
1 parent 4b3afe23
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Make changes to tests 

* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 43 changed files with 109 additions and 131 deletions   Show diff stats
features/steps/dashboard/dashboard_issues.rb
  Diff comments   View file @c227aa4
... ... @@ -66,7 +66,7 @@ class DashboardIssues &lt; Spinach::FeatureSteps
66 66  
67 67 def project
68 68 @project ||= begin
69   - project =create :project_with_code
  69 + project =create :project
70 70 project.team << [current_user, :master]
71 71 project
72 72 end
... ...
features/steps/dashboard/dashboard_merge_requests.rb
  Diff comments   View file @c227aa4
... ... @@ -66,7 +66,7 @@ class DashboardMergeRequests &lt; Spinach::FeatureSteps
66 66  
67 67 def project
68 68 @project ||= begin
69   - project =create :project_with_code
  69 + project =create :project
70 70 project.team << [current_user, :master]
71 71 project
72 72 end
... ...
features/steps/project/project_fork.rb
  Diff comments   View file @c227aa4
... ... @@ -12,7 +12,7 @@ class ForkProject &lt; Spinach::FeatureSteps
12 12  
13 13 step 'I am a member of project "Shop"' do
14 14 @project = Project.find_by_name "Shop"
15   - @project ||= create(:project_with_code, name: "Shop", group: create(:group))
  15 + @project ||= create(:project, name: "Shop", group: create(:group))
16 16 @project.team << [@user, :reporter]
17 17 end
18 18  
... ... @@ -26,7 +26,7 @@ class ForkProject &lt; Spinach::FeatureSteps
26 26 current_user.namespace ||= create(:namespace)
27 27 current_user.namespace.should_not be_nil
28 28 current_user.namespace.path.should_not be_nil
29   - @my_project = create(:project_with_code, name: "Shop", namespace: current_user.namespace)
  29 + @my_project = create(:project, name: "Shop", namespace: current_user.namespace)
30 30 end
31 31  
32 32 step 'I should see a "Name has already been taken" warning' do
... ...
features/steps/project/project_forked_merge_requests.rb
  Diff comments   View file @c227aa4
... ... @@ -7,7 +7,7 @@ class ProjectForkedMergeRequests &lt; Spinach::FeatureSteps
7 7  
8 8 step 'I am a member of project "Shop"' do
9 9 @project = Project.find_by_name "Shop"
10   - @project ||= create(:project_with_code, name: "Shop")
  10 + @project ||= create(:project, name: "Shop")
11 11 @project.team << [@user, :reporter]
12 12 end
13 13  
... ... @@ -15,7 +15,7 @@ class ProjectForkedMergeRequests &lt; Spinach::FeatureSteps
15 15 @forking_user = @user
16 16 forked_project_link = build(:forked_project_link)
17 17 @forked_project = Project.find_by_name "Forked Shop"
18   - @forked_project ||= create(:source_project_with_code, name: "Forked Shop", forked_project_link: forked_project_link, creator_id: @forking_user.id , namespace: @forking_user.namespace)
  18 + @forked_project ||= create(:source_project, name: "Forked Shop", forked_project_link: forked_project_link, creator_id: @forking_user.id , namespace: @forking_user.namespace)
19 19  
20 20 forked_project_link.forked_from_project = @project
21 21 forked_project_link.forked_to_project = @forked_project
... ...
features/steps/project/project_issue_tracker.rb
  Diff comments   View file @c227aa4
... ... @@ -5,7 +5,7 @@ class ProjectIssueTracker &lt; Spinach::FeatureSteps
5 5  
6 6 step 'project "Shop" has issues enabled' do
7 7 @project = Project.find_by_name "Shop"
8   - @project ||= create(:project_with_code, name: "Shop", namespace: @user.namespace)
  8 + @project ||= create(:project, name: "Shop", namespace: @user.namespace)
9 9 @project.issues_enabled = true
10 10 end
11 11  
... ...
features/steps/project/project_markdown_render.rb
  Diff comments   View file @c227aa4
... ... @@ -4,7 +4,7 @@ class Spinach::Features::ProjectMarkdownRender &lt; Spinach::FeatureSteps
4 4  
5 5 And 'I own project "Delta"' do
6 6 @project = Project.find_by_name "Delta"
7   - @project ||= create(:project_with_code, name: "Delta", namespace: @user.namespace)
  7 + @project ||= create(:project, name: "Delta", namespace: @user.namespace)
8 8 @project.team << [@user, :master]
9 9 end
10 10  
... ...
features/steps/project/redirects.rb
  Diff comments   View file @c227aa4
... ... @@ -4,7 +4,7 @@ class Spinach::Features::ProjectRedirects &lt; Spinach::FeatureSteps
4 4 include SharedProject
5 5  
6 6 step 'public project "Community"' do
7   - create :project_with_code, name: 'Community', visibility_level: Gitlab::VisibilityLevel::PUBLIC
  7 + create :project, name: 'Community', visibility_level: Gitlab::VisibilityLevel::PUBLIC
8 8 end
9 9  
10 10 step 'private project "Enterprise"' do
... ...
features/steps/public/projects_feature.rb
  Diff comments   View file @c227aa4
... ... @@ -25,7 +25,7 @@ class Spinach::Features::PublicProjectsFeature &lt; Spinach::FeatureSteps
25 25 end
26 26  
27 27 step 'public project "Community"' do
28   - create :project_with_code, name: 'Community', visibility_level: Gitlab::VisibilityLevel::PUBLIC
  28 + create :project, name: 'Community', visibility_level: Gitlab::VisibilityLevel::PUBLIC
29 29 end
30 30  
31 31 step 'public empty project "Empty Public Project"' do
... ... @@ -76,7 +76,7 @@ class Spinach::Features::PublicProjectsFeature &lt; Spinach::FeatureSteps
76 76 end
77 77  
78 78 step 'internal project "Internal"' do
79   - create :project_with_code, name: 'Internal', visibility_level: Gitlab::VisibilityLevel::INTERNAL
  79 + create :project, name: 'Internal', visibility_level: Gitlab::VisibilityLevel::INTERNAL
80 80 end
81 81  
82 82 step 'I should see project "Internal"' do
... ...
features/steps/shared/project.rb
  Diff comments   View file @c227aa4
... ... @@ -3,21 +3,21 @@ module SharedProject
3 3  
4 4 # Create a project without caring about what it's called
5 5 And "I own a project" do
6   - @project = create(:project_with_code, namespace: @user.namespace)
  6 + @project = create(:project, namespace: @user.namespace)
7 7 @project.team << [@user, :master]
8 8 end
9 9  
10 10 # Create a specific project called "Shop"
11 11 And 'I own project "Shop"' do
12 12 @project = Project.find_by_name "Shop"
13   - @project ||= create(:project_with_code, name: "Shop", namespace: @user.namespace)
  13 + @project ||= create(:project, name: "Shop", namespace: @user.namespace)
14 14 @project.team << [@user, :master]
15 15 end
16 16  
17 17 # Create another specific project called "Forum"
18 18 And 'I own project "Forum"' do
19 19 @project = Project.find_by_name "Forum"
20   - @project ||= create(:project_with_code, name: "Forum", namespace: @user.namespace, path: 'forum_project')
  20 + @project ||= create(:project, name: "Forum", namespace: @user.namespace, path: 'forum_project')
21 21 @project.team << [@user, :master]
22 22 end
23 23  
... ...
spec/controllers/blob_controller_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe Projects::BlobController do
4   - let(:project) { create(:project_with_code) }
  4 + let(:project) { create(:project) }
5 5 let(:user) { create(:user) }
6 6  
7 7 before do
... ...
spec/controllers/commit_controller_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe Projects::CommitController do
4   - let(:project) { create(:project_with_code) }
  4 + let(:project) { create(:project) }
5 5 let(:user) { create(:user) }
6 6 let(:commit) { project.repository.commit("master") }
7 7  
... ...
spec/controllers/commits_controller_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe Projects::CommitsController do
4   - let(:project) { create(:project_with_code) }
  4 + let(:project) { create(:project) }
5 5 let(:user) { create(:user) }
6 6  
7 7 before do
... ...
spec/controllers/merge_requests_controller_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe Projects::MergeRequestsController do
4   - let(:project) { create(:project_with_code) }
  4 + let(:project) { create(:project) }
5 5 let(:user) { create(:user) }
6 6 let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project, target_branch: "stable", source_branch: "master") }
7 7  
... ...
spec/controllers/tree_controller_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe Projects::TreeController do
4   - let(:project) { create(:project_with_code) }
  4 + let(:project) { create(:project) }
5 5 let(:user) { create(:user) }
6 6  
7 7 before do
... ...
spec/factories.rb
  Diff comments   View file @c227aa4
... ... @@ -27,43 +27,16 @@ FactoryGirl.define do
27 27 factory :admin, traits: [:admin]
28 28 end
29 29  
30   - factory :project do
  30 + factory :empty_project, class: 'Project' do
31 31 sequence(:name) { |n| "project#{n}" }
32 32 path { name.downcase.gsub(/\s/, '_') }
33 33 namespace
34 34 creator
35   -
36   - trait :source do
37   - sequence(:name) { |n| "source project#{n}" }
38   - end
39   - trait :target do
40   - sequence(:name) { |n| "target project#{n}" }
41   - end
42   -
43   - factory :source_project, traits: [:source]
44   - factory :target_project, traits: [:target]
45 35 end
46 36  
47   -
48   - factory :redmine_project, parent: :project do
49   - issues_tracker { "redmine" }
50   - issues_tracker_id { "project_name_in_redmine" }
51   - end
52   -
53   - factory :project_with_code, parent: :project do
  37 + factory :project, parent: :empty_project do
54 38 path { 'gitlabhq' }
55 39  
56   - trait :source_path do
57   - path { 'source_gitlabhq' }
58   - end
59   -
60   - trait :target_path do
61   - path { 'target_gitlabhq' }
62   - end
63   -
64   - factory :source_project_with_code, traits: [:source, :source_path]
65   - factory :target_project_with_code, traits: [:target, :target_path]
66   -
67 40 after :create do |project|
68 41 TestEnv.clear_repo_dir(project.namespace, project.path)
69 42 TestEnv.reset_satellite_dir
... ... @@ -71,6 +44,11 @@ FactoryGirl.define do
71 44 end
72 45 end
73 46  
  47 + factory :redmine_project, parent: :project do
  48 + issues_tracker { "redmine" }
  49 + issues_tracker_id { "project_name_in_redmine" }
  50 + end
  51 +
74 52 factory :group do
75 53 sequence(:name) { |n| "group#{n}" }
76 54 path { name.downcase.gsub(/\s/, '_') }
... ... @@ -109,25 +87,12 @@ FactoryGirl.define do
109 87 factory :merge_request do
110 88 title
111 89 author
112   - source_project factory: :source_project_with_code
113   - target_project factory: :target_project_with_code
  90 + source_project factory: :project
  91 + target_project { source_project }
114 92 source_branch "master"
115 93 target_branch "stable"
116 94  
117   - # pick 3 commits "at random" (from bcf03b5d~3 to bcf03b5d)
118 95 trait :with_diffs do
119   - target_branch "master" # pretend bcf03b5d~3
120   - source_branch "stable" # pretend bcf03b5d
121   - st_commits do
122   - [
123   - source_project.repository.commit('bcf03b5d').to_hash,
124   - source_project.repository.commit('bcf03b5d~1').to_hash,
125   - source_project.repository.commit('bcf03b5d~2').to_hash
126   - ]
127   - end
128   - st_diffs do
129   - source_project.repo.diff("bcf03b5d~3", "bcf03b5d")
130   - end
131 96 end
132 97  
133 98 trait :closed do
... ... @@ -156,7 +121,7 @@ FactoryGirl.define do
156 121 factory :note_on_merge_request_with_attachment, traits: [:on_merge_request, :with_attachment]
157 122  
158 123 trait :on_commit do
159   - project factory: :project_with_code
  124 + project factory: :project
160 125 commit_id "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
161 126 noteable_type "Commit"
162 127 end
... ... @@ -166,7 +131,7 @@ FactoryGirl.define do
166 131 end
167 132  
168 133 trait :on_merge_request do
169   - project factory: :project_with_code
  134 + project factory: :project
170 135 noteable_id 1
171 136 noteable_type "MergeRequest"
172 137 end
... ...
spec/features/gitlab_flavored_markdown_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe "GitLab Flavored Markdown" do
4   - let(:project) { create(:project_with_code) }
  4 + let(:project) { create(:project) }
5 5 let(:issue) { create(:issue, project: project) }
6 6 let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
7 7 let(:fred) do
... ...
spec/features/notes_on_merge_requests_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe "On a merge request", js: true do
4   - let!(:project) { create(:project_with_code) }
  4 + let!(:project) { create(:project) }
5 5 let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
6 6 let!(:note) { create(:note_on_merge_request_with_attachment, project: project) }
7 7  
... ... @@ -135,7 +135,7 @@ describe &quot;On a merge request&quot;, js: true do
135 135 end
136 136  
137 137 describe "On a merge request diff", js: true, focus: true do
138   - let!(:project) { create(:source_project_with_code) }
  138 + let!(:project) { create(:source_project) }
139 139 let!(:merge_request) { create(:merge_request_with_diffs, source_project: project, target_project: project) }
140 140  
141 141 before do
... ... @@ -185,7 +185,7 @@ describe &quot;On a merge request diff&quot;, js: true, focus: true do
185 185 end
186 186  
187 187 describe "with muliple note forms" do
188   - let!(:project) { create(:source_project_with_code) }
  188 + let!(:project) { create(:source_project) }
189 189 let!(:merge_request) { create(:merge_request_with_diffs, source_project: project, target_project: project) }
190 190  
191 191 before do
... ...
spec/features/security/project/internal_access_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe "Internal Project Access" do
4   - let(:project) { create(:project_with_code) }
  4 + let(:project) { create(:project) }
5 5  
6 6 let(:master) { create(:user) }
7 7 let(:guest) { create(:user) }
... ...
spec/features/security/project/private_access_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe "Private Project Access" do
4   - let(:project) { create(:project_with_code) }
  4 + let(:project) { create(:project) }
5 5  
6 6 let(:master) { create(:user) }
7 7 let(:guest) { create(:user) }
... ...
spec/features/security/project/public_access_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe "Public Project Access" do
4   - let(:project) { create(:project_with_code) }
  4 + let(:project) { create(:project) }
5 5  
6 6 let(:master) { create(:user) }
7 7 let(:guest) { create(:user) }
... ...
spec/helpers/gitlab_markdown_helper_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -4,7 +4,7 @@ describe GitlabMarkdownHelper do
4 4 include ApplicationHelper
5 5 include IssuesHelper
6 6  
7   - let!(:project) { create(:project_with_code) }
  7 + let!(:project) { create(:project) }
8 8  
9 9 let(:user) { create(:user, username: 'gfm') }
10 10 let(:commit) { project.repository.commit }
... ...
spec/helpers/search_helper_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -43,7 +43,7 @@ describe SearchHelper do
43 43 end
44 44  
45 45 context "with a current project" do
46   - before { @project = create(:project_with_code) }
  46 + before { @project = create(:project) }
47 47  
48 48 it "includes project-specific sections" do
49 49 search_autocomplete_opts("Files").size.should == 1
... ...
spec/lib/gitlab/reference_extractor_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -43,7 +43,7 @@ describe Gitlab::ReferenceExtractor do
43 43 end
44 44  
45 45 context 'with a project' do
46   - let(:project) { create(:project_with_code) }
  46 + let(:project) { create(:project) }
47 47  
48 48 it 'accesses valid user objects on the project team' do
49 49 @u_foo = create(:user, username: 'foo')
... ...
spec/lib/gitlab/satellite/action_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe 'Gitlab::Satellite::Action' do
4   - let(:project) { create(:project_with_code) }
  4 + let(:project) { create(:project) }
5 5 let(:user) { create(:user) }
6 6  
7 7 describe '#prepare_satellite!' do
... ...
spec/lib/gitlab/satellite/merge_action_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -12,7 +12,7 @@ describe &#39;Gitlab::Satellite::MergeAction&#39; do
12 12 @close_commit2 = ['scss_refactoring', 'f0f14c8eaba69ebddd766498a9d0b0e79becd633']
13 13 end
14 14  
15   - let(:project) { create(:project_with_code) }
  15 + let(:project) { create(:project) }
16 16 let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
17 17 let(:merge_request_fork) { create(:merge_request) }
18 18  
... ...
spec/mailers/notify_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -5,7 +5,7 @@ describe Notify do
5 5 include EmailSpec::Matchers
6 6  
7 7 let(:recipient) { create(:user, email: 'recipient@example.com') }
8   - let(:project) { create(:project_with_code) }
  8 + let(:project) { create(:project) }
9 9  
10 10 shared_examples 'a multiple recipients email' do
11 11 it 'is sent to the given recipient' do
... ...
spec/models/assembla_service_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -25,7 +25,7 @@ describe AssemblaService do
25 25  
26 26 describe "Execute" do
27 27 let(:user) { create(:user) }
28   - let(:project) { create(:project_with_code) }
  28 + let(:project) { create(:project) }
29 29  
30 30 before do
31 31 @assembla_service = AssemblaService.new
... ...
spec/models/commit_spec.rb
  Diff comments   View file @c227aa4
1 1 require 'spec_helper'
2 2  
3 3 describe Commit do
4   - let(:project) { create :project_with_code }
  4 + let(:project) { create :project }
5 5 let(:commit) { project.repository.commit }
6 6  
7 7 describe '#title' do
... ...
spec/models/flowdock_service_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -25,7 +25,7 @@ describe FlowdockService do
25 25  
26 26 describe "Execute" do
27 27 let(:user) { create(:user) }
28   - let(:project) { create(:project_with_code) }
  28 + let(:project) { create(:project) }
29 29  
30 30 before do
31 31 @flowdock_service = FlowdockService.new
... ...
spec/models/note_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -206,7 +206,7 @@ describe Note do
206 206 end
207 207  
208 208 describe '#create_cross_reference_note' do
209   - let(:project) { create(:project_with_code) }
  209 + let(:project) { create(:project) }
210 210 let(:author) { create(:user) }
211 211 let(:issue) { create(:issue, project: project) }
212 212 let(:mergereq) { create(:merge_request, target_project: project) }
... ...
spec/models/project_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -128,7 +128,7 @@ describe Project do
128 128 end
129 129  
130 130 describe :update_merge_requests do
131   - let(:project) { create(:project_with_code) }
  131 + let(:project) { create(:project) }
132 132  
133 133 before do
134 134 @merge_request = create(:merge_request, source_project: project, target_project: project)
... ... @@ -237,7 +237,7 @@ describe Project do
237 237 end
238 238  
239 239 describe :open_branches do
240   - let(:project) { create(:project_with_code) }
  240 + let(:project) { create(:project) }
241 241  
242 242 before do
243 243 project.protected_branches.create(name: 'master')
... ...
spec/models/service_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -49,7 +49,7 @@ describe Service do
49 49 end
50 50  
51 51 describe "With commits" do
52   - let (:project) { create :project_with_code }
  52 + let (:project) { create :project }
53 53  
54 54 before do
55 55 @service.stub(
... ...
spec/observers/merge_request_observer_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -4,16 +4,17 @@ describe MergeRequestObserver do
4 4 let(:some_user) { create :user }
5 5 let(:assignee) { create :user }
6 6 let(:author) { create :user }
  7 + let(:project) { create :project }
7 8 let(:mr_mock) { double(:merge_request, id: 42, assignee: assignee, author: author).as_null_object }
8   - let(:assigned_mr) { create(:merge_request, assignee: assignee, author: author, target_project: create(:project)) }
9   - let(:unassigned_mr) { create(:merge_request, author: author, target_project: create(:project)) }
10   - let(:closed_assigned_mr) { create(:closed_merge_request, assignee: assignee, author: author, target_project: create(:project)) }
11   - let(:closed_unassigned_mr) { create(:closed_merge_request, author: author, target_project: create(:project)) }
  9 + let(:assigned_mr) { create(:merge_request, assignee: assignee, author: author, source_project: project) }
  10 + let(:unassigned_mr) { create(:merge_request, author: author, source_project: project) }
  11 + let(:closed_assigned_mr) { create(:closed_merge_request, assignee: assignee, author: author, source_project: project) }
  12 + let(:closed_unassigned_mr) { create(:closed_merge_request, author: author, source_project: project) }
12 13  
13 14 before { subject.stub(:current_user).and_return(some_user) }
14 15 before { subject.stub(notification: double('NotificationService').as_null_object) }
15 16 before { mr_mock.stub(:author_id) }
16   - before { mr_mock.stub(:target_project) }
  17 + before { mr_mock.stub(:source_project) }
17 18 before { mr_mock.stub(:source_project) }
18 19 before { mr_mock.stub(:project) }
19 20 before { mr_mock.stub(:create_cross_references!).and_return(true) }
... ... @@ -46,7 +47,7 @@ describe MergeRequestObserver do
46 47 end
47 48  
48 49 it 'is called when a merge request is changed' do
49   - changed = create(:merge_request, source_project: create(:project))
  50 + changed = create(:merge_request, source_project: project)
50 51 subject.should_receive(:after_update)
51 52  
52 53 MergeRequest.observers.enable :merge_request_observer do
... ... @@ -81,13 +82,13 @@ describe MergeRequestObserver do
81 82 context '#after_close' do
82 83 context 'a status "closed"' do
83 84 it 'note is created if the merge request is being closed' do
84   - Note.should_receive(:create_status_change_note).with(assigned_mr, assigned_mr.target_project, some_user, 'closed', nil)
  85 + Note.should_receive(:create_status_change_note).with(assigned_mr, assigned_mr.source_project, some_user, 'closed', nil)
85 86  
86 87 assigned_mr.close
87 88 end
88 89  
89 90 it 'notification is delivered only to author if the merge request is being closed' do
90   - Note.should_receive(:create_status_change_note).with(unassigned_mr, unassigned_mr.target_project, some_user, 'closed', nil)
  91 + Note.should_receive(:create_status_change_note).with(unassigned_mr, unassigned_mr.source_project, some_user, 'closed', nil)
91 92  
92 93 unassigned_mr.close
93 94 end
... ... @@ -97,13 +98,13 @@ describe MergeRequestObserver do
97 98 context '#after_reopen' do
98 99 context 'a status "reopened"' do
99 100 it 'note is created if the merge request is being reopened' do
100   - Note.should_receive(:create_status_change_note).with(closed_assigned_mr, closed_assigned_mr.target_project, some_user, 'reopened', nil)
  101 + Note.should_receive(:create_status_change_note).with(closed_assigned_mr, closed_assigned_mr.source_project, some_user, 'reopened', nil)
101 102  
102 103 closed_assigned_mr.reopen
103 104 end
104 105  
105 106 it 'notification is delivered only to author if the merge request is being reopened' do
106   - Note.should_receive(:create_status_change_note).with(closed_unassigned_mr, closed_unassigned_mr.target_project, some_user, 'reopened', nil)
  107 + Note.should_receive(:create_status_change_note).with(closed_unassigned_mr, closed_unassigned_mr.source_project, some_user, 'reopened', nil)
107 108  
108 109 closed_unassigned_mr.reopen
109 110 end
... ... @@ -118,20 +119,13 @@ describe MergeRequestObserver do
118 119 it { @event.project.should == project }
119 120 end
120 121  
121   - let(:project) { create(:project) }
122 122 before do
123   - TestEnv.enable_observers
124   - @merge_request = create(:merge_request, source_project: project, target_project: project)
  123 + @merge_request = create(:merge_request, source_project: project, source_project: project)
125 124 @event = Event.last
126 125 end
127 126  
128   - after do
129   - TestEnv.disable_observers
130   - end
131   -
132 127 it_should_be_valid_event
133 128 it { @event.action.should == Event::CREATED }
134 129 it { @event.target.should == @merge_request }
135 130 end
136   -
137 131 end
... ...
spec/requests/api/files_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -6,7 +6,7 @@ describe API::API do
6 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
7 7  
8 8 let(:user) { create(:user) }
9   - let!(:project) { create(:project_with_code, namespace: user.namespace ) }
  9 + let!(:project) { create(:project, namespace: user.namespace ) }
10 10 before { project.team << [user, :developer] }
11 11  
12 12 describe "POST /projects/:id/repository/files" do
... ...
spec/requests/api/merge_requests_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -5,7 +5,7 @@ describe API::API do
5 5 before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
6 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
7 7 let(:user) { create(:user) }
8   - let!(:project) {create(:project_with_code, creator_id: user.id, namespace: user.namespace) }
  8 + let!(:project) {create(:project, creator_id: user.id, namespace: user.namespace) }
9 9 let!(:merge_request) { create(:merge_request, author: user, assignee: user, source_project: project, target_project: project, title: "Test") }
10 10 before {
11 11 project.team << [user, :reporters]
... ... @@ -80,8 +80,8 @@ describe API::API do
80 80 context 'forked projects' do
81 81 let!(:user2) {create(:user)}
82 82 let!(:forked_project_link) { build(:forked_project_link) }
83   - let!(:fork_project) { create(:source_project_with_code, forked_project_link: forked_project_link, namespace: user2.namespace, creator_id: user2.id) }
84   - let!(:unrelated_project) { create(:target_project_with_code, namespace: user2.namespace, creator_id: user2.id) }
  83 + let!(:fork_project) { create(:source_project, forked_project_link: forked_project_link, namespace: user2.namespace, creator_id: user2.id) }
  84 + let!(:unrelated_project) { create(:target_project, namespace: user2.namespace, creator_id: user2.id) }
85 85  
86 86 before :each do |each|
87 87 fork_project.team << [user2, :reporters]
... ...
spec/requests/api/project_hooks_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -7,7 +7,7 @@ describe API::API, &#39;ProjectHooks&#39; do
7 7  
8 8 let(:user) { create(:user) }
9 9 let(:user3) { create(:user) }
10   - let!(:project) { create(:project_with_code, creator_id: user.id, namespace: user.namespace) }
  10 + let!(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
11 11 let!(:hook) { create(:project_hook, project: project, url: "http://example.com") }
12 12  
13 13 before do
... ...
spec/requests/api/projects_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -9,14 +9,14 @@ describe API::API do
9 9 let(:user2) { create(:user) }
10 10 let(:user3) { create(:user) }
11 11 let(:admin) { create(:admin) }
12   - let!(:project) { create(:project_with_code, creator_id: user.id, namespace: user.namespace) }
13   - let!(:snippet) { create(:project_snippet, author: user, project: project, title: 'example') }
14   - let!(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
15   - let!(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
16   -
17   - before { project.team << [user, :reporter] }
  12 + let(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
  13 + let(:snippet) { create(:project_snippet, author: user, project: project, title: 'example') }
  14 + let(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
  15 + let(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
18 16  
19 17 describe "GET /projects" do
  18 + before { project }
  19 +
20 20 context "when unauthenticated" do
21 21 it "should return authentication error" do
22 22 get api("/projects")
... ... @@ -36,6 +36,8 @@ describe API::API do
36 36 end
37 37  
38 38 describe "GET /projects/all" do
  39 + before { project }
  40 +
39 41 context "when unauthenticated" do
40 42 it "should return authentication error" do
41 43 get api("/projects/all")
... ... @@ -174,6 +176,7 @@ describe API::API do
174 176 end
175 177  
176 178 describe "POST /projects/user/:id" do
  179 + before { project }
177 180 before { admin }
178 181  
179 182 it "should create new project without path" do
... ... @@ -255,6 +258,8 @@ describe API::API do
255 258 end
256 259  
257 260 describe "GET /projects/:id" do
  261 + before { project }
  262 +
258 263 it "should return a project by id" do
259 264 get api("/projects/#{project.id}", user)
260 265 response.status.should == 200
... ... @@ -282,6 +287,8 @@ describe API::API do
282 287 end
283 288  
284 289 describe "GET /projects/:id/events" do
  290 + before { users_project }
  291 +
285 292 it "should return a project events" do
286 293 get api("/projects/#{project.id}/events", user)
287 294 response.status.should == 200
... ... @@ -305,6 +312,9 @@ describe API::API do
305 312 end
306 313  
307 314 describe "GET /projects/:id/members" do
  315 + before { users_project }
  316 + before { users_project2 }
  317 +
308 318 it "should return project team members" do
309 319 get api("/projects/#{project.id}/members", user)
310 320 response.status.should == 200
... ... @@ -328,6 +338,8 @@ describe API::API do
328 338 end
329 339  
330 340 describe "GET /projects/:id/members/:user_id" do
  341 + before { users_project }
  342 +
331 343 it "should return project team member" do
332 344 get api("/projects/#{project.id}/members/#{user.id}", user)
333 345 response.status.should == 200
... ... @@ -383,6 +395,8 @@ describe API::API do
383 395 end
384 396  
385 397 describe "PUT /projects/:id/members/:user_id" do
  398 + before { users_project2 }
  399 +
386 400 it "should update project team member" do
387 401 put api("/projects/#{project.id}/members/#{user3.id}", user), access_level: UsersProject::MASTER
388 402 response.status.should == 200
... ... @@ -407,6 +421,9 @@ describe API::API do
407 421 end
408 422  
409 423 describe "DELETE /projects/:id/members/:user_id" do
  424 + before { users_project }
  425 + before { users_project2 }
  426 +
410 427 it "should remove user from project team" do
411 428 expect {
412 429 delete api("/projects/#{project.id}/members/#{user3.id}", user)
... ... @@ -425,9 +442,7 @@ describe API::API do
425 442 delete api("/projects/#{project.id}/members/#{user3.id}", user)
426 443 response.status.should == 200
427 444 end
428   - end
429 445  
430   - describe "DELETE /projects/:id/members/:user_id" do
431 446 it "should return 200 OK when the user was not member" do
432 447 expect {
433 448 delete api("/projects/#{project.id}/members/1000000", user)
... ... @@ -439,6 +454,8 @@ describe API::API do
439 454 end
440 455  
441 456 describe "GET /projects/:id/snippets" do
  457 + before { snippet }
  458 +
442 459 it "should return an array of project snippets" do
443 460 get api("/projects/#{project.id}/snippets", user)
444 461 response.status.should == 200
... ... @@ -505,6 +522,8 @@ describe API::API do
505 522 end
506 523  
507 524 describe "DELETE /projects/:id/snippets/:snippet_id" do
  525 + before { snippet }
  526 +
508 527 it "should delete existing project snippet" do
509 528 expect {
510 529 delete api("/projects/#{project.id}/snippets/#{snippet.id}", user)
... ... @@ -657,15 +676,15 @@ describe API::API do
657 676  
658 677 describe "GET /projects/search/:query" do
659 678 let!(:query) { 'query'}
660   - let!(:search) { create(:project, name: query, creator_id: user.id, namespace: user.namespace) }
661   - let!(:pre) { create(:project, name: "pre_#{query}", creator_id: user.id, namespace: user.namespace) }
662   - let!(:post) { create(:project, name: "#{query}_post", creator_id: user.id, namespace: user.namespace) }
663   - let!(:pre_post) { create(:project, name: "pre_#{query}_post", creator_id: user.id, namespace: user.namespace) }
664   - let!(:unfound) { create(:project, name: 'unfound', creator_id: user.id, namespace: user.namespace) }
665   - let!(:internal) { create(:project, name: "internal #{query}", visibility_level: Gitlab::VisibilityLevel::INTERNAL) }
666   - let!(:unfound_internal) { create(:project, name: 'unfound internal', visibility_level: Gitlab::VisibilityLevel::INTERNAL) }
667   - let!(:public) { create(:project, name: "public #{query}", visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
668   - let!(:unfound_public) { create(:project, name: 'unfound public', visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
  679 + let!(:search) { create(:empty_project, name: query, creator_id: user.id, namespace: user.namespace) }
  680 + let!(:pre) { create(:empty_project, name: "pre_#{query}", creator_id: user.id, namespace: user.namespace) }
  681 + let!(:post) { create(:empty_project, name: "#{query}_post", creator_id: user.id, namespace: user.namespace) }
  682 + let!(:pre_post) { create(:empty_project, name: "pre_#{query}_post", creator_id: user.id, namespace: user.namespace) }
  683 + let!(:unfound) { create(:empty_project, name: 'unfound', creator_id: user.id, namespace: user.namespace) }
  684 + let!(:internal) { create(:empty_project, name: "internal #{query}", visibility_level: Gitlab::VisibilityLevel::INTERNAL) }
  685 + let!(:unfound_internal) { create(:empty_project, name: 'unfound internal', visibility_level: Gitlab::VisibilityLevel::INTERNAL) }
  686 + let!(:public) { create(:empty_project, name: "public #{query}", visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
  687 + let!(:unfound_public) { create(:empty_project, name: 'unfound public', visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
669 688  
670 689 context "when unauthenticated" do
671 690 it "should return authentication error" do
... ...
spec/requests/api/repositories_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -8,7 +8,7 @@ describe API::API do
8 8  
9 9 let(:user) { create(:user) }
10 10 let(:user2) { create(:user) }
11   - let!(:project) { create(:project_with_code, creator_id: user.id) }
  11 + let!(:project) { create(:project, creator_id: user.id) }
12 12 let!(:master) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
13 13 let!(:guest) { create(:users_project, user: user2, project: project, project_access: UsersProject::GUEST) }
14 14  
... ...
spec/requests/api/services_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -6,7 +6,7 @@ describe API::API do
6 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
7 7  
8 8 let(:user) { create(:user) }
9   - let(:project) {create(:project_with_code, creator_id: user.id, namespace: user.namespace) }
  9 + let(:project) {create(:project, creator_id: user.id, namespace: user.namespace) }
10 10  
11 11 describe "POST /projects/:id/services/gitlab-ci" do
12 12 it "should update gitlab-ci settings" do
... ...
spec/services/git_push_service_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -2,7 +2,7 @@ require &#39;spec_helper&#39;
2 2  
3 3 describe GitPushService do
4 4 let (:user) { create :user }
5   - let (:project) { create :project_with_code }
  5 + let (:project) { create :project }
6 6 let (:service) { GitPushService.new }
7 7  
8 8 before do
... ...
spec/services/test_hook_service_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -2,7 +2,7 @@ require &#39;spec_helper&#39;
2 2  
3 3 describe TestHookService do
4 4 let (:user) { create :user }
5   - let (:project) { create :project_with_code }
  5 + let (:project) { create :project }
6 6 let (:hook) { create :project_hook, project: project }
7 7  
8 8 describe :execute do
... ...
spec/support/mentionable_shared_examples.rb
  Diff comments   View file @c227aa4
... ... @@ -11,7 +11,7 @@ def common_mentionable_setup
11 11  
12 12 let(:mentioned_issue) { create :issue, project: mproject }
13 13 let(:other_issue) { create :issue, project: mproject }
14   - let(:mentioned_mr) { create :merge_request, target_project: mproject, source_branch: 'different' }
  14 + let(:mentioned_mr) { create :merge_request, source_project: mproject, source_branch: 'different' }
15 15 let(:mentioned_commit) { double('commit', sha: '1234567890abcdef').as_null_object }
16 16  
17 17 # Override to add known commits to the repository stub.
... ...
spec/workers/post_receive_spec.rb
  Diff comments   View file @c227aa4
... ... @@ -9,7 +9,7 @@ describe PostReceive do
9 9 end
10 10  
11 11 context "web hook" do
12   - let(:project) { create(:project_with_code) }
  12 + let(:project) { create(:project) }
13 13 let(:key) { create(:key, user: project.owner) }
14 14 let(:key_id) { key.shell_id }
15 15  
... ...