diff --git a/spec/defines/resource_location_spec.rb b/spec/defines/resource_location_spec.rb index 790a922..23cc8ac 100644 --- a/spec/defines/resource_location_spec.rb +++ b/spec/defines/resource_location_spec.rb @@ -45,7 +45,7 @@ describe 'nginx::resource::location' do :title => 'should contain ordered prepended directives', :attr => 'location_cfg_prepend', :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3', - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ ' allow test value 3;', @@ -97,7 +97,7 @@ describe 'nginx::resource::location' do :title => 'should contain ordered appended directives', :attr => 'location_cfg_append', :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3', - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ ' allow test value 3;', @@ -169,14 +169,14 @@ describe 'nginx::resource::location' do { :title => 'should contain ordered prepended directives', :attr => 'location_cfg_prepend', - :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3', - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3', + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ ' allow test value 3;', - ' test1 test value 1a;', - ' test1 test value 1b;', - ' test2 test value 2;', + ' test1 test value 1;', + ' test2 test value 2a;', + ' test2 test value 2b;', ' test4 subtest1 "sub test value1a";', ' test4 subtest1 "sub test value1b";', ' test4 subtest2 "sub test value2";', @@ -191,15 +191,14 @@ describe 'nginx::resource::location' do { :title => 'should contain ordered appended directives', :attr => 'location_cfg_append', - :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => ['test value 3a', 'test value 3b', 'test value 3c'], - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3', + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ - ' allow test value 3a;', - ' allow test value 3b;', - ' allow test value 3c;', + ' allow test value 3;', ' test1 test value 1;', - ' test2 test value 2;', + ' test2 test value 2a;', + ' test2 test value 2b;', ' test4 subtest1 "sub test value1a";', ' test4 subtest1 "sub test value1b";', ' test4 subtest2 "sub test value2";', @@ -234,7 +233,7 @@ describe 'nginx::resource::location' do :title => 'should contain ordered prepended directives', :attr => 'location_cfg_prepend', :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3', - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ ' allow test value 3;', @@ -250,7 +249,7 @@ describe 'nginx::resource::location' do :title => 'should contain ordered appended directives', :attr => 'location_cfg_append', :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3', - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ ' allow test value 3;', @@ -290,14 +289,14 @@ describe 'nginx::resource::location' do { :title => 'should contain ordered prepended directives', :attr => 'location_cfg_prepend', - :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3', - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3', + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ ' allow test value 3;', - ' test1 test value 1a;', - ' test1 test value 1b;', - ' test2 test value 2;', + ' test1 test value 1;', + ' test2 test value 2a;', + ' test2 test value 2b;', ' test4 subtest1 "sub test value1a";', ' test4 subtest1 "sub test value1b";', ' test4 subtest2 "sub test value2";', @@ -343,7 +342,7 @@ describe 'nginx::resource::location' do :title => 'should contain ordered appended directives', :attr => 'location_cfg_append', :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3', - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ ' allow test value 3;', @@ -396,7 +395,7 @@ describe 'nginx::resource::location' do :title => 'should contain ordered prepended directives', :attr => 'location_cfg_prepend', :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3', - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ ' allow test value 3;', @@ -441,14 +440,14 @@ describe 'nginx::resource::location' do { :title => 'should contain ordered appended directives', :attr => 'location_cfg_append', - :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3', - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3', + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ ' allow test value 3;', - ' test1 test value 1a;', - ' test1 test value 1b;', - ' test2 test value 2;', + ' test1 test value 1;', + ' test2 test value 2a;', + ' test2 test value 2b;', ' test4 subtest1 "sub test value1a";', ' test4 subtest1 "sub test value1b";', ' test4 subtest2 "sub test value2";', @@ -503,7 +502,7 @@ describe 'nginx::resource::location' do :title => 'should contain ordered config directives', :attr => 'location_custom_cfg', :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3', - 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'], + 'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'], 'subtest2' => '"sub test value2"' } }, :match => [ ' allow test value 3;',