yogsototh/riemann-dash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplification of test setup

Browse source
This commit is contained in:
Andy Marks 2014-12-03 11:58:15 +11:00
parent 6ff3951bba
commit d1b0485aef
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/browser_config_test.rb
View file

@ -37,13 +37,13 @@ describe "Riemann::Dash::BrowserConfig" do
it "prioritises the value from the first config" do
merged_configs = Riemann::Dash::BrowserConfig.merge_configs(@first_config, @second_config)
assert_equal 'first_server', merged_configs['server']
assert_equal @first_config['server'], merged_configs['server']
end
it "uses the value from the second config if no other exists" do
merged_configs = Riemann::Dash::BrowserConfig.merge_configs({}, @second_config)
assert_equal 'second_server', merged_configs['server']
assert_equal @second_config['server'], merged_configs['server']
end
end
@ -51,13 +51,13 @@ describe "Riemann::Dash::BrowserConfig" do
it "prioritises the value from the first config" do
merged_configs = Riemann::Dash::BrowserConfig.merge_configs(@first_config, @second_config)
assert_equal 'first_type', merged_configs['server_type']
assert_equal @first_config['server_type'], merged_configs['server_type']
end
it "uses the value from the second config if no other exists" do
merged_configs = Riemann::Dash::BrowserConfig.merge_configs({}, @second_config)
assert_equal 'second_type', merged_configs['server_type']
assert_equal @second_config['server_type'], merged_configs['server_type']
end
end
end