summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-07 17:20:57 +0200
committerRémy Coutable <remy@rymai.me>2017-09-07 17:20:57 +0200
commit64298367f06095cf1f6b70d2beb8945aca3626f8 (patch)
tree98286865eebe67e74f12843aceb9ff979d2c7098
parent4de47af4b31ece52a047b872c596e8c0ee5c7bcf (diff)
downloadgitlab-ce-36008-use-build_stubbed-in-unit-specs.tar.gz
Revert a few `build_stubbed` to `create`36008-use-build_stubbed-in-unit-specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--spec/models/container_repository_spec.rb8
-rw-r--r--spec/models/diff_discussion_spec.rb12
-rw-r--r--spec/models/diff_viewer/base_spec.rb2
-rw-r--r--spec/models/project_team_spec.rb102
-rw-r--r--spec/models/trending_project_spec.rb20
5 files changed, 72 insertions, 72 deletions
diff --git a/spec/models/container_repository_spec.rb b/spec/models/container_repository_spec.rb
index 99182529e61..a2b2f3c4f27 100644
--- a/spec/models/container_repository_spec.rb
+++ b/spec/models/container_repository_spec.rb
@@ -1,8 +1,8 @@
require 'spec_helper'
describe ContainerRepository do
- let(:group) { build_stubbed(:group, name: 'group') }
- let(:project) { build_stubbed(:project, path: 'test', group: group) }
+ let(:group) { create(:group, name: 'group') }
+ let(:project) { create(:project, path: 'test', group: group) }
let(:repository) do
build_stubbed(:container_repository, name: 'my_image', project: project)
@@ -75,7 +75,7 @@ describe ContainerRepository do
describe '#delete_tags!' do
let(:repository) do
- build_stubbed(:container_repository, name: 'my_image',
+ create(:container_repository, name: 'my_image',
tags: %w[latest rc1],
project: project)
end
@@ -185,7 +185,7 @@ describe ContainerRepository do
end
context 'when received multi-level repository with nested groups' do
- let(:group) { build_stubbed(:group, :nested, name: 'nested') }
+ let(:group) { create(:group, :nested, name: 'nested') }
let(:path) { project.full_path + '/some/image' }
it 'fabricates repository assigned to a correct project' do
diff --git a/spec/models/diff_discussion_spec.rb b/spec/models/diff_discussion_spec.rb
index 4d21a1a2ac7..55f25e7b087 100644
--- a/spec/models/diff_discussion_spec.rb
+++ b/spec/models/diff_discussion_spec.rb
@@ -5,8 +5,8 @@ describe DiffDiscussion do
subject { described_class.new([diff_note]) }
- let(:project) { build_stubbed(:project, :repository) }
- let(:merge_request) { build_stubbed(:merge_request, source_project: project, target_project: project) }
+ let(:project) { create(:project, :repository) }
+ let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
let(:diff_note) { build_stubbed(:diff_note_on_merge_request, noteable: merge_request, project: project) }
describe '#reply_attributes' do
@@ -18,7 +18,7 @@ describe DiffDiscussion do
end
describe '#merge_request_version_params' do
- let(:merge_request) { build_stubbed(:merge_request, source_project: project, target_project: project, importing: true) }
+ let(:merge_request) { create(:merge_request, source_project: project, target_project: project, importing: true) }
let!(:merge_request_diff1) { merge_request.merge_request_diffs.create(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') }
let!(:merge_request_diff2) { merge_request.merge_request_diffs.create(head_commit_sha: nil) }
let!(:merge_request_diff3) { merge_request.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
@@ -40,7 +40,7 @@ describe DiffDiscussion do
)
end
- let(:diff_note) { build_stubbed(:diff_note_on_merge_request, noteable: merge_request, project: project, position: position) }
+ let(:diff_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project, position: position) }
before do
diff_note.position = diff_note.original_position
@@ -63,7 +63,7 @@ describe DiffDiscussion do
)
end
- let(:diff_note) { build_stubbed(:diff_note_on_merge_request, noteable: merge_request, project: project, position: position) }
+ let(:diff_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project, position: position) }
before do
diff_note.position = diff_note.original_position
@@ -76,7 +76,7 @@ describe DiffDiscussion do
end
context 'when the discussion does not have a merge request version' do
- let(:diff_note) { build_stubbed(:diff_note_on_merge_request, noteable: merge_request, project: project, diff_refs: project.commit(sample_commit.id).diff_refs) }
+ let(:diff_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project, diff_refs: project.commit(sample_commit.id).diff_refs) }
before do
diff_note.position = diff_note.original_position
diff --git a/spec/models/diff_viewer/base_spec.rb b/spec/models/diff_viewer/base_spec.rb
index cdd71975e08..b26de3f3b97 100644
--- a/spec/models/diff_viewer/base_spec.rb
+++ b/spec/models/diff_viewer/base_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe DiffViewer::Base do
include FakeBlobHelpers
- let(:project) { build_stubbed(:project, :repository) }
+ let(:project) { create(:project, :repository) }
let(:commit) { project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
diff --git a/spec/models/project_team_spec.rb b/spec/models/project_team_spec.rb
index 7ab0f0b454a..d91c5d882df 100644
--- a/spec/models/project_team_spec.rb
+++ b/spec/models/project_team_spec.rb
@@ -1,13 +1,13 @@
require "spec_helper"
describe ProjectTeam do
- let(:master) { build_stubbed(:user) }
- let(:reporter) { build_stubbed(:user) }
- let(:guest) { build_stubbed(:user) }
- let(:nonmember) { build_stubbed(:user) }
+ let(:master) { create(:user) }
+ let(:reporter) { create(:user) }
+ let(:guest) { create(:user) }
+ let(:nonmember) { create(:user) }
context 'personal project' do
- let(:project) { build_stubbed(:project) }
+ let(:project) { create(:project) }
before do
project.add_master(master)
@@ -36,8 +36,8 @@ describe ProjectTeam do
end
context 'group project' do
- let(:group) { build_stubbed(:group) }
- let!(:project) { build_stubbed(:project, group: group) }
+ let(:group) { create(:group) }
+ let!(:project) { create(:project, group: group) }
before do
group.add_master(master)
@@ -75,17 +75,17 @@ describe ProjectTeam do
describe '#fetch_members' do
context 'personal project' do
- let(:project) { build_stubbed(:project) }
+ let(:project) { create(:project) }
it 'returns project members' do
- user = build_stubbed(:user)
+ user = create(:user)
project.add_guest(user)
expect(project.team.members).to contain_exactly(user, project.owner)
end
it 'returns project members of a specified level' do
- user = build_stubbed(:user)
+ user = create(:user)
project.add_reporter(user)
expect(project.team.guests).to be_empty
@@ -93,7 +93,7 @@ describe ProjectTeam do
end
it 'returns invited members of a group' do
- group_member = build_stubbed(:group_member)
+ group_member = create(:group_member)
project.project_group_links.create!(
group: group_member.group,
@@ -105,7 +105,7 @@ describe ProjectTeam do
end
it 'returns invited members of a group of a specified level' do
- group_member = build_stubbed(:group_member)
+ group_member = create(:group_member)
project.project_group_links.create!(
group: group_member.group,
@@ -118,17 +118,17 @@ describe ProjectTeam do
end
context 'group project' do
- let(:group) { build_stubbed(:group) }
- let!(:project) { build_stubbed(:project, group: group) }
+ let(:group) { create(:group) }
+ let!(:project) { create(:project, group: group) }
it 'returns project members' do
- group_member = build_stubbed(:group_member, group: group)
+ group_member = create(:group_member, group: group)
expect(project.team.members).to contain_exactly(group_member.user)
end
it 'returns project members of a specified level' do
- group_member = build_stubbed(:group_member, :reporter, group: group)
+ group_member = create(:group_member, :reporter, group: group)
expect(project.team.guests).to be_empty
expect(project.team.reporters).to contain_exactly(group_member.user)
@@ -139,10 +139,10 @@ describe ProjectTeam do
describe '#find_member' do
context 'personal project' do
let(:project) do
- build_stubbed(:project, :public, :access_requestable)
+ create(:project, :public, :access_requestable)
end
- let(:requester) { build_stubbed(:user) }
+ let(:requester) { create(:user) }
before do
project.add_master(master)
@@ -159,9 +159,9 @@ describe ProjectTeam do
end
context 'group project' do
- let(:group) { build_stubbed(:group, :access_requestable) }
- let(:project) { build_stubbed(:project, group: group) }
- let(:requester) { build_stubbed(:user) }
+ let(:group) { create(:group, :access_requestable) }
+ let(:project) { create(:project, group: group) }
+ let(:requester) { create(:user) }
before do
group.add_master(master)
@@ -180,9 +180,9 @@ describe ProjectTeam do
describe "#human_max_access" do
it 'returns Master role' do
- user = build_stubbed(:user)
- group = build_stubbed(:group)
- project = build_stubbed(:project, namespace: group)
+ user = create(:user)
+ group = create(:group)
+ project = create(:project, namespace: group)
group.add_master(user)
@@ -190,9 +190,9 @@ describe ProjectTeam do
end
it 'returns Owner role' do
- user = build_stubbed(:user)
- group = build_stubbed(:group)
- project = build_stubbed(:project, namespace: group)
+ user = create(:user)
+ group = create(:group)
+ project = create(:project, namespace: group)
group.add_owner(user)
@@ -201,11 +201,11 @@ describe ProjectTeam do
end
describe '#max_member_access' do
- let(:requester) { build_stubbed(:user) }
+ let(:requester) { create(:user) }
context 'personal project' do
let(:project) do
- build_stubbed(:project, :public, :access_requestable)
+ create(:project, :public, :access_requestable)
end
context 'when project is not shared with group' do
@@ -225,7 +225,7 @@ describe ProjectTeam do
context 'when project is shared with group' do
before do
- group = build_stubbed(:group)
+ group = create(:group)
project.project_group_links.create(
group: group,
group_access: Gitlab::Access::DEVELOPER)
@@ -251,9 +251,9 @@ describe ProjectTeam do
end
context 'group project' do
- let(:group) { build_stubbed(:group, :access_requestable) }
+ let(:group) { create(:group, :access_requestable) }
let!(:project) do
- build_stubbed(:project, group: group)
+ create(:project, group: group)
end
before do
@@ -272,20 +272,20 @@ describe ProjectTeam do
end
describe '#member?' do
- let(:group) { build_stubbed(:group) }
- let(:developer) { build_stubbed(:user) }
- let(:master) { build_stubbed(:user) }
+ let(:group) { create(:group) }
+ let(:developer) { create(:user) }
+ let(:master) { create(:user) }
let(:personal_project) do
- build_stubbed(:project, namespace: developer.namespace)
+ create(:project, namespace: developer.namespace)
end
let(:group_project) do
- build_stubbed(:project, namespace: group)
+ create(:project, namespace: group)
end
- let(:members_project) { build_stubbed(:project) }
- let(:shared_project) { build_stubbed(:project) }
+ let(:members_project) { create(:project) }
+ let(:shared_project) { create(:project) }
before do
group.add_master(master)
@@ -294,7 +294,7 @@ describe ProjectTeam do
members_project.team << [developer, :developer]
members_project.team << [master, :master]
- build_stubbed(:project_group_link, project: shared_project, group: group)
+ create(:project_group_link, project: shared_project, group: group)
end
it 'returns false for no user' do
@@ -330,21 +330,21 @@ describe ProjectTeam do
end
shared_examples 'max member access for users' do
- let(:project) { build_stubbed(:project) }
- let(:group) { build_stubbed(:group) }
- let(:second_group) { build_stubbed(:group) }
+ let(:project) { create(:project) }
+ let(:group) { create(:group) }
+ let(:second_group) { create(:group) }
- let(:master) { build_stubbed(:user) }
- let(:reporter) { build_stubbed(:user) }
- let(:guest) { build_stubbed(:user) }
+ let(:master) { create(:user) }
+ let(:reporter) { create(:user) }
+ let(:guest) { create(:user) }
- let(:promoted_guest) { build_stubbed(:user) }
+ let(:promoted_guest) { create(:user) }
- let(:group_developer) { build_stubbed(:user) }
- let(:second_developer) { build_stubbed(:user) }
+ let(:group_developer) { create(:user) }
+ let(:second_developer) { create(:user) }
- let(:user_without_access) { build_stubbed(:user) }
- let(:second_user_without_access) { build_stubbed(:user) }
+ let(:user_without_access) { create(:user) }
+ let(:second_user_without_access) { create(:user) }
let(:users) do
[master, reporter, promoted_guest, guest, group_developer, second_developer, user_without_access].map(&:id)
diff --git a/spec/models/trending_project_spec.rb b/spec/models/trending_project_spec.rb
index e25e98a54cf..cef1a085bc4 100644
--- a/spec/models/trending_project_spec.rb
+++ b/spec/models/trending_project_spec.rb
@@ -2,24 +2,24 @@ require 'spec_helper'
describe TrendingProject do
let(:user) { build_stubbed(:user) }
- let(:public_project1) { build_stubbed(:project, :public) }
- let(:public_project2) { build_stubbed(:project, :public) }
- let(:public_project3) { build_stubbed(:project, :public) }
- let(:private_project) { build_stubbed(:project, :private) }
- let(:internal_project) { build_stubbed(:project, :internal) }
+ let(:public_project1) { create(:project, :public) }
+ let(:public_project2) { create(:project, :public) }
+ let(:public_project3) { create(:project, :public) }
+ let(:private_project) { create(:project, :private) }
+ let(:internal_project) { create(:project, :internal) }
before do
3.times do
- build_stubbed(:note_on_commit, project: public_project1)
+ create(:note_on_commit, project: public_project1)
end
2.times do
- build_stubbed(:note_on_commit, project: public_project2)
+ create(:note_on_commit, project: public_project2)
end
- build_stubbed(:note_on_commit, project: public_project3, created_at: 5.weeks.ago)
- build_stubbed(:note_on_commit, project: private_project)
- build_stubbed(:note_on_commit, project: internal_project)
+ create(:note_on_commit, project: public_project3, created_at: 5.weeks.ago)
+ create(:note_on_commit, project: private_project)
+ create(:note_on_commit, project: internal_project)
end
describe '.refresh!' do