opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix diff lines leftover from merge

Browse source
This commit is contained in:
Marin Vintila 2015-05-08 12:22:31 +03:00
parent 77aa952b20
commit 66ee87b89e
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spec/defines/resource_location_spec.rb
View file

@ -743,9 +743,7 @@ describe 'nginx::resource::location' do
:vhost => 'vhost1',
} end
it { expect { is_expected.to contain_class('nginx::resource::location') }.to raise_error(Puppet::Error, /Cannot create a location reference without a www_root, proxy, location_alias, fastcgi, uwsgi, stub_status, or location_custom_cfg defined/) }
it { expect { is_expected.to contain_class('nginx::resource::location') }.to raise_error(Puppet::Error, /Cannot create a location reference without a www_root, proxy, location_alias, fastcgi, stub_status, internal, or location_custom_cfg defined/) }
>>>>>>> 7c4473857369fdf09aa24a97e3ccc180ef3b4c73
it { expect { is_expected.to contain_class('nginx::resource::location') }.to raise_error(Puppet::Error, /Cannot create a location reference without a www_root, proxy, location_alias, fastcgi, uwsgi, stub_status, internal, or location_custom_cfg defined/) }
end
context "www_root and proxy are set" do