Commit f536c133550b74b3083c66adaebf0ae6d425f81b
1 parent
3b88636d
Exists in
master
and in
4 other branches
fixed test using repo with commits but old factory
Showing
8 changed files
with
10 additions
and
19 deletions
Show diff stats
spec/helpers/gitlab_markdown_helper_spec.rb
| @@ -4,7 +4,7 @@ describe GitlabMarkdownHelper do | @@ -4,7 +4,7 @@ describe GitlabMarkdownHelper do | ||
| 4 | include ApplicationHelper | 4 | include ApplicationHelper |
| 5 | include IssuesHelper | 5 | include IssuesHelper |
| 6 | 6 | ||
| 7 | - let!(:project) { create(:project) } | 7 | + let!(:project) { create(:project_with_code) } |
| 8 | 8 | ||
| 9 | let(:user) { create(:user, username: 'gfm') } | 9 | let(:user) { create(:user, username: 'gfm') } |
| 10 | let(:commit) { project.repository.commit } | 10 | let(:commit) { project.repository.commit } |
spec/lib/git/commit_spec.rb
| 1 | require "spec_helper" | 1 | require "spec_helper" |
| 2 | 2 | ||
| 3 | describe Gitlab::Git::Commit do | 3 | describe Gitlab::Git::Commit do |
| 4 | - let(:commit) { create(:project).repository.commit } | 4 | + let(:commit) { create(:project_with_code).repository.commit } |
| 5 | 5 | ||
| 6 | describe "Commit info" do | 6 | describe "Commit info" do |
| 7 | before do | 7 | before do |
| @@ -45,6 +45,5 @@ describe Gitlab::Git::Commit do | @@ -45,6 +45,5 @@ describe Gitlab::Git::Commit do | ||
| 45 | it { should respond_to(:commits_since) } | 45 | it { should respond_to(:commits_since) } |
| 46 | it { should respond_to(:commits_between) } | 46 | it { should respond_to(:commits_between) } |
| 47 | it { should respond_to(:commits) } | 47 | it { should respond_to(:commits) } |
| 48 | - it { should respond_to(:compare) } | ||
| 49 | end | 48 | end |
| 50 | end | 49 | end |
spec/lib/git/repository_spec.rb
| 1 | require "spec_helper" | 1 | require "spec_helper" |
| 2 | 2 | ||
| 3 | describe Gitlab::Git::Repository do | 3 | describe Gitlab::Git::Repository do |
| 4 | - let(:project) { create(:project) } | ||
| 5 | - let(:repository) { project.repository } | 4 | + let(:repository) { Gitlab::Git::Repository.new('gitlabhq', 'master') } |
| 6 | 5 | ||
| 7 | describe "Respond to" do | 6 | describe "Respond to" do |
| 8 | subject { repository } | 7 | subject { repository } |
spec/mailers/notify_spec.rb
| @@ -5,7 +5,7 @@ describe Notify do | @@ -5,7 +5,7 @@ describe Notify do | ||
| 5 | include EmailSpec::Matchers | 5 | include EmailSpec::Matchers |
| 6 | 6 | ||
| 7 | let(:recipient) { create(:user, email: 'recipient@example.com') } | 7 | let(:recipient) { create(:user, email: 'recipient@example.com') } |
| 8 | - let(:project) { create(:project) } | 8 | + let(:project) { create(:project_with_code) } |
| 9 | 9 | ||
| 10 | shared_examples 'a multiple recipients email' do | 10 | shared_examples 'a multiple recipients email' do |
| 11 | it 'is sent to the given recipient' do | 11 | it 'is sent to the given recipient' do |
| @@ -277,14 +277,7 @@ describe Notify do | @@ -277,14 +277,7 @@ describe Notify do | ||
| 277 | end | 277 | end |
| 278 | 278 | ||
| 279 | describe 'on a commit' do | 279 | describe 'on a commit' do |
| 280 | - let(:commit) do | ||
| 281 | - mock(:commit).tap do |commit| | ||
| 282 | - commit.stub(:id).and_return('fauxsha1') | ||
| 283 | - commit.stub(:project).and_return(project) | ||
| 284 | - commit.stub(:short_id).and_return('fauxsha1') | ||
| 285 | - commit.stub(:safe_message).and_return('some message') | ||
| 286 | - end | ||
| 287 | - end | 280 | + let(:commit) { project.repository.commit } |
| 288 | 281 | ||
| 289 | before(:each) { note.stub(:noteable).and_return(commit) } | 282 | before(:each) { note.stub(:noteable).and_return(commit) } |
| 290 | 283 | ||
| @@ -297,7 +290,7 @@ describe Notify do | @@ -297,7 +290,7 @@ describe Notify do | ||
| 297 | end | 290 | end |
| 298 | 291 | ||
| 299 | it 'contains a link to the commit' do | 292 | it 'contains a link to the commit' do |
| 300 | - should have_body_text /fauxsha1/ | 293 | + should have_body_text commit.short_id |
| 301 | end | 294 | end |
| 302 | end | 295 | end |
| 303 | 296 |
spec/requests/api/merge_requests_spec.rb
| @@ -4,7 +4,7 @@ describe Gitlab::API do | @@ -4,7 +4,7 @@ describe Gitlab::API do | ||
| 4 | include ApiHelpers | 4 | include ApiHelpers |
| 5 | 5 | ||
| 6 | let(:user) { create(:user ) } | 6 | let(:user) { create(:user ) } |
| 7 | - let!(:project) { create(:project, namespace: user.namespace ) } | 7 | + let!(:project) { create(:project_with_code, creator_id: user.id) } |
| 8 | let!(:merge_request) { create(:merge_request, author: user, assignee: user, project: project, title: "Test") } | 8 | let!(:merge_request) { create(:merge_request, author: user, assignee: user, project: project, title: "Test") } |
| 9 | before { project.team << [user, :reporters] } | 9 | before { project.team << [user, :reporters] } |
| 10 | 10 |
spec/requests/api/projects_spec.rb
| @@ -7,7 +7,7 @@ describe Gitlab::API do | @@ -7,7 +7,7 @@ describe Gitlab::API do | ||
| 7 | let(:user2) { create(:user) } | 7 | let(:user2) { create(:user) } |
| 8 | let(:user3) { create(:user) } | 8 | let(:user3) { create(:user) } |
| 9 | let(:admin) { create(:admin) } | 9 | let(:admin) { create(:admin) } |
| 10 | - let!(:project) { create(:project, namespace: user.namespace ) } | 10 | + let!(:project) { create(:project_with_code, creator_id: user.id) } |
| 11 | let!(:hook) { create(:project_hook, project: project, url: "http://example.com") } | 11 | let!(:hook) { create(:project_hook, project: project, url: "http://example.com") } |
| 12 | let!(:snippet) { create(:snippet, author: user, project: project, title: 'example') } | 12 | let!(:snippet) { create(:snippet, author: user, project: project, title: 'example') } |
| 13 | let!(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) } | 13 | let!(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) } |
spec/services/git_push_service_spec.rb
| @@ -2,7 +2,7 @@ require 'spec_helper' | @@ -2,7 +2,7 @@ require 'spec_helper' | ||
| 2 | 2 | ||
| 3 | describe GitPushService do | 3 | describe GitPushService do |
| 4 | let (:user) { create :user } | 4 | let (:user) { create :user } |
| 5 | - let (:project) { create :project } | 5 | + let (:project) { create :project_with_code } |
| 6 | let (:service) { GitPushService.new } | 6 | let (:service) { GitPushService.new } |
| 7 | 7 | ||
| 8 | before do | 8 | before do |
spec/workers/post_receive_spec.rb
| @@ -9,7 +9,7 @@ describe PostReceive do | @@ -9,7 +9,7 @@ describe PostReceive do | ||
| 9 | end | 9 | end |
| 10 | 10 | ||
| 11 | context "web hook" do | 11 | context "web hook" do |
| 12 | - let(:project) { create(:project) } | 12 | + let(:project) { create(:project_with_code) } |
| 13 | let(:key) { create(:key, user: project.owner) } | 13 | let(:key) { create(:key, user: project.owner) } |
| 14 | let(:key_id) { key.shell_id } | 14 | let(:key_id) { key.shell_id } |
| 15 | 15 |