summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-15 01:16:25 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-20 16:54:28 +0100
commit19eb63741995e3be60781db74edab5d5ae896c6b (patch)
tree349c2f0d63b4bf89500de1c8c3ee5887dc981e68 /spec/models
parentb2e46f44ceee2078b8e1d92ae5ff892c044bc0e7 (diff)
downloadgitlab-ce-19eb63741995e3be60781db74edab5d5ae896c6b.tar.gz
Update uses of Gitolite.config.foo settings
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/project_hooks_spec.rb2
-rw-r--r--spec/models/project_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/project_hooks_spec.rb b/spec/models/project_hooks_spec.rb
index 39a628a9436..df6a3831e30 100644
--- a/spec/models/project_hooks_spec.rb
+++ b/spec/models/project_hooks_spec.rb
@@ -108,7 +108,7 @@ describe Project, "Hooks" do
it { should include(id: @commit.id) }
it { should include(message: @commit.safe_message) }
it { should include(timestamp: @commit.date.xmlschema) }
- it { should include(url: "#{Gitlab.config.url}/#{project.code}/commit/#{@commit.id}") }
+ it { should include(url: "#{Gitlab.config.gitlab.url}/#{project.code}/commit/#{@commit.id}") }
context "with a author" do
subject { @data[:commits].first[:author] }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index b9eafc7fa1e..83a76976098 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -148,7 +148,7 @@ describe Project do
it "should return valid url to repo" do
project = Project.new(path: "somewhere")
- project.url_to_repo.should == Gitlab.config.ssh_path + "somewhere.git"
+ project.url_to_repo.should == Gitlab.config.gitolite.ssh_path_prefix + "somewhere.git"
end
it "should return path to repo" do
@@ -158,7 +158,7 @@ describe Project do
it "returns the full web URL for this repo" do
project = Project.new(path: "somewhere")
- project.web_url.should == "#{Gitlab.config.url}/somewhere"
+ project.web_url.should == "#{Gitlab.config.gitlab.url}/somewhere"
end
describe "last_activity methods" do