summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-07-02 21:51:48 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-07-02 21:51:48 +0300
commit9b337b8328a65c5e692c90ba1f817184bd054257 (patch)
treee650cf925fe783649bf37d0f315a7a59c6c80d26 /spec
parentb3a0ee8e631c3e272c8ce3b60929192d3f7f1f22 (diff)
downloadgitlab-ce-9b337b8328a65c5e692c90ba1f817184bd054257.tar.gz
Epic: Gitlab configuration with default values
Diffstat (limited to 'spec')
-rw-r--r--spec/mailers/notify_spec.rb2
-rw-r--r--spec/models/project_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 31b211b66ff..aabb4334d0c 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -5,7 +5,7 @@ describe Notify do
include EmailSpec::Matchers
before :all do
- default_url_options[:host] = EMAIL_OPTS['host']
+ default_url_options[:host] = Gitlab.config.web_host
end
let(:recipient) { Factory.create(:user, :email => 'recipient@example.com') }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index ab1baf0e505..0c54ae0136a 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -56,7 +56,7 @@ describe Project do
it "returns the full web URL for this repo" do
project = Project.new(:code => "somewhere")
- project.web_url.should == "#{GIT_HOST['host']}/somewhere"
+ project.web_url.should == "#{Gitlab.config.url}/somewhere"
end
describe :valid_repo? do