summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-13 23:54:49 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-13 23:54:49 +0200
commit3676838dc96bbe1c8c7eec7e6ca545c462dfc12d (patch)
tree28659c8fcb8f938f607676d79bc95950b5837b60 /spec/models
parent781f5aa6fb25b4aed91f711daefdae4bce8d968b (diff)
downloadgitlab-ce-3676838dc96bbe1c8c7eec7e6ca545c462dfc12d.tar.gz
Rspec test repo replaced.\nMerge Requests improved
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/note_spec.rb2
-rw-r--r--spec/models/project_spec.rb15
2 files changed, 8 insertions, 9 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 70eba5cc194..f36f12dd6ec 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -54,7 +54,7 @@ describe Note do
describe :authorization do
before do
@p1 = project
- @p2 = Factory :project, :code => "alien", :path => "legit_1"
+ @p2 = Factory :project, :code => "alien", :path => "gitlabhq_1"
@u1 = Factory :user
@u2 = Factory :user
@u3 = Factory :user
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index bb76bbc4f34..cb28a7eca38 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -86,23 +86,22 @@ describe Project do
let(:project) { Factory :project }
it { project.fresh_commits(3).count.should == 3 }
- it { project.fresh_commits.first.id.should == "2fb376f61875b58bceee0492e270e9c805294b1a" }
- it { project.fresh_commits.last.id.should == "0dac878dbfe0b9c6104a87d65fe999149a8d862c" }
+ it { project.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
+ it { project.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" }
end
describe "commits_between" do
let(:project) { Factory :project }
subject do
- commits = project.commits_between("a6d1d4aca0c85816ddfd27d93773f43a31395033",
- "2fb376f61875b58bceee0492e270e9c805294b1a")
+ commits = project.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
+ "8470d70da67355c9c009e4401746b1d5410af2e3")
commits.map { |c| c.id }
end
- it { should have(2).elements }
- it { should include("2fb376f61875b58bceee0492e270e9c805294b1a") }
- it { should include("4571e226fbcd7be1af16e9fa1e13b7ac003bebdf") }
- it { should_not include("a6d1d4aca0c85816ddfd27d93773f43a31395033") }
+ it { should have(3).elements }
+ it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") }
+ it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
end
describe "Git methods" do