(maint) Consolidate puppetserver and puppetserver-standalone spec tests

voxpupuli · Feb 11, 2019 · 5e99444 · 5e99444
1 parent 90d74ca
commit 5e99444
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 64 deletions.
diff --git a/Makefile b/Makefile
@@ -55,8 +55,8 @@ endif
 
 test: prep
 	@bundle install --path .bundle/gems
-	@PUPPET_TEST_DOCKER_IMAGE=puppet/puppetserver-standalone:$(version) bundle exec rspec --options puppetserver-standalone/.rspec puppetserver-standalone/spec
-	@PUPPET_TEST_DOCKER_IMAGE=puppet/puppetserver:$(version) bundle exec rspec --options puppetserver/.rspec puppetserver/spec
+	@PUPPET_TEST_DOCKER_IMAGE=puppet/puppetserver-standalone:$(version) bundle exec rspec --options puppetserver-standalone/.rspec spec
+	@PUPPET_TEST_DOCKER_IMAGE=puppet/puppetserver:$(version) bundle exec rspec --options puppetserver/.rspec spec
 
 publish: prep
 	@docker push puppet/puppetserver-standalone:$(version)

diff --git a/ci/build.ps1 b/ci/build.ps1
@@ -61,7 +61,7 @@ function Invoke-ContainerTest(
 
   bundle install --path .bundle/gems
   $ENV:PUPPET_TEST_DOCKER_IMAGE = "$Namespace/${Name}:$Version"
-  bundle exec rspec --options $Name/.rspec $Name/spec
+  bundle exec rspec --options $Name/.rspec spec
 
   Pop-Location
 }

diff --git a/puppetserver-standalone/spec/puppetserver_spec.rb b/puppetserver-standalone/spec/puppetserver_spec.rb
diff --git a/puppetserver/spec/puppetserver_spec.rb → spec/puppetserver_spec.rb b/puppetserver/spec/puppetserver_spec.rb → spec/puppetserver_spec.rb