summaryrefslogtreecommitdiff
path: root/spec/models/project_spec.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-09-27 09:56:02 +0300
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-09-27 09:56:02 +0300
commit19c58becc00982b718f0e11b74129ef2ccce2454 (patch)
treeee7eb18b8e59074bc56ea06fd30ae241beed4a2f /spec/models/project_spec.rb
parent0439387be00bfb862b4454000f805f11fb8cc389 (diff)
parent2c8d3c33ff64ac6af5daf125a2f9ef917e55bcfc (diff)
downloadgitlab-ce-19c58becc00982b718f0e11b74129ef2ccce2454.tar.gz
Merge branch 'tsigo-routing_overhaul'
Diffstat (limited to 'spec/models/project_spec.rb')
-rw-r--r--spec/models/project_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index c313b58ecd6..bb975a93dfd 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -125,7 +125,7 @@ describe Project do
it "should return path to repo" do
project = Project.new(path: "somewhere")
- project.path_to_repo.should == File.join(Rails.root, "tmp", "repositories", "somewhere")
+ project.path_to_repo.should == Rails.root.join("tmp", "repositories", "somewhere")
end
it "returns the full web URL for this repo" do