summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2018-07-30 14:49:11 +1000
committerAsh McKenzie <amckenzie@gitlab.com>2018-08-01 00:24:17 +1000
commitac424489fc73ae06e4fd25e2135aebc30972df49 (patch)
tree3e1aa4f79d34e24e3af596cf703ab1a5223c150b
parent8bd29b09cd57478a570d509ec1e9785381897495 (diff)
downloadgitlab-shell-ac424489fc73ae06e4fd25e2135aebc30972df49.tar.gz
Updated GitlabConfig spec to be less brittle
-rw-r--r--spec/gitlab_config_spec.rb36
1 files changed, 31 insertions, 5 deletions
diff --git a/spec/gitlab_config_spec.rb b/spec/gitlab_config_spec.rb
index a1c52a0..dd7e3bc 100644
--- a/spec/gitlab_config_spec.rb
+++ b/spec/gitlab_config_spec.rb
@@ -3,29 +3,55 @@ require_relative '../lib/gitlab_config'
describe GitlabConfig do
let(:config) { GitlabConfig.new }
+ let(:config_data) do
+ {
+ # 'user' => 'git',
+ # 'http_settings' => {
+ # 'self_signed_cert' => false
+ # },
+ # 'log_level' => 'ERROR',
+ # 'audit_usernames' => true,
+ # 'log_format' => 'json', # Not sure on other values?
+ # 'git_trace_log_file' => nil
+ }
+ end
+
+ before do
+ expect(YAML).to receive(:load_file).and_return(config_data)
+ end
- describe :gitlab_url do
+ describe '#gitlab_url' do
let(:url) { 'http://test.com' }
+
subject { config.gitlab_url }
- before { config.send(:config)['gitlab_url'] = url }
+
+ before { config_data['gitlab_url'] = url }
it { should_not be_empty }
it { should eq(url) }
context 'remove trailing slashes' do
- before { config.send(:config)['gitlab_url'] = url + '//' }
+ before { config_data['gitlab_url'] = url + '//' }
it { should eq(url) }
end
end
- describe :audit_usernames do
+ describe '#audit_usernames' do
subject { config.audit_usernames }
it("returns false by default") { should eq(false) }
end
- describe :log_format do
+ describe '#log_level' do
+ subject { config.log_level }
+
+ it 'returns "INFO" by default' do
+ should eq('INFO')
+ end
+ end
+
+ describe '#log_format' do
subject { config.log_format }
it 'returns "text" by default' do