diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 539e67b9..5937c915 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -6,7 +6,9 @@ # Using puppet_apply as a helper it 'should work idempotently with no errors' do pp = <<-EOS - class { 'gitlab': } + class { 'gitlab': + external_url => "http://${::fqdn}", + } EOS # Run it twice and test for idempotency @@ -19,8 +21,15 @@ class { 'gitlab': } end describe service('gitlab') do - it { is_expected.to be_enabled } it { is_expected.to be_running } end + + it 'allows http connection on port 8080' do + shell 'sleep 15' # give it some time to start up + describe command('curl 0.0.0.0:80/users/sign_in') do + its(:stdout) { should match /GitLab/ } + end + end + end end diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-66-x64.yml similarity index 56% rename from spec/acceptance/nodesets/centos-65-x64.yml rename to spec/acceptance/nodesets/centos-66-x64.yml index db50349e..b4c28e21 100644 --- a/spec/acceptance/nodesets/centos-65-x64.yml +++ b/spec/acceptance/nodesets/centos-66-x64.yml @@ -1,12 +1,11 @@ HOSTS: - centos-65-x64: + centos-66-x64: roles: - master platform: el-6-x86_64 - box: puppetlabs/centos-6.5-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.5-64-nocm - hypervisor: vagrant - + box: puppetlabs/centos-6.6-64-nocm + box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.6-64-nocm + hypervisor : vagrant CONFIG: - log_level: verbose + log_level: debug type: foss diff --git a/spec/acceptance/nodesets/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml index 8e735374..f9aaed00 100644 --- a/spec/acceptance/nodesets/centos-7-x64.yml +++ b/spec/acceptance/nodesets/centos-7-x64.yml @@ -3,10 +3,9 @@ HOSTS: roles: - master platform: el-7-x86_64 - box: chef/centos-7.0 - box_url: https://vagrantcloud.com/chef/boxes/centos-7.0 + box: puppetlabs/centos-7.0-64-nocm + box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm hypervisor: vagrant - CONFIG: log_level: verbose type: foss