diff options
author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-09-27 09:56:02 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-09-27 09:56:02 +0300 |
commit | 19c58becc00982b718f0e11b74129ef2ccce2454 (patch) | |
tree | ee7eb18b8e59074bc56ea06fd30ae241beed4a2f /spec/models | |
parent | 0439387be00bfb862b4454000f805f11fb8cc389 (diff) | |
parent | 2c8d3c33ff64ac6af5daf125a2f9ef917e55bcfc (diff) | |
download | gitlab-ce-19c58becc00982b718f0e11b74129ef2ccce2454.tar.gz |
Merge branch 'tsigo-routing_overhaul'
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/project_spec.rb | 2 |
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 |