Merge pull request #216 from joshrabinowitz/bats-core5

for testing, use bats-core v1.0.2, not bats

.ci/integration/tasks/dependencies.yml

@@ -12,17 +12,6 @@
     state: present
   with_items: "{{ test_dependencies }}"
 
-- name: Get bats
-  git:
-    repo: 'https://github.com/sstephenson/bats.git'
-    dest: /opt/bats
-
-- name: Install bats
-  file:
-    src: /opt/bats/libexec/bats
-    dest: /usr/bin/bats
-    state: link
-
 - name: Get ShellCheck
   get_url:
     url: https://storage.googleapis.com/shellcheck/shellcheck-latest.linux.x86_64.tar.xz

Makefile

@@ -35,14 +35,16 @@ uninstall:
 
 .PHONY: install-test
 install-test:
-	@if [ ! -d "vendor/bats" ]; then \
-	git clone https://github.com/sstephenson/bats.git vendor/bats; fi
+	@if [ ! -d "vendor/bats-core" ]; then \
+	git clone https://github.com/bats-core/bats-core.git vendor/bats-core; \
+	cd vendor/bats-core && git checkout v1.0.2; \
+	fi
 
 .PHONY: test
 test: install-test clean build
 	@chmod +x "./utils/tests.sh"; sync; \
 	export SECRET_PROJECT_ROOT="${PWD}"; \
-	export PATH="${PWD}/vendor/bats/bin:${PWD}:${PATH}"; \
+	export PATH="${PWD}/vendor/bats-core/bin:${PWD}:${PATH}"; \
 	"./utils/tests.sh"
 
 #
@@ -105,7 +107,7 @@ build-apk: clean build install-fpm
 test-apk-ci: install-test build-apk
 	@chmod +x "./utils/apk/apk-ci.sh"; sync; \
 	export SECRET_PROJECT_ROOT="${PWD}"; \
-	export PATH="${PWD}/vendor/bats/bin:${PATH}"; \
+	export PATH="${PWD}/vendor/bats-core/bin:${PATH}"; \
 	"./utils/apk/apk-ci.sh"
 
 .PHONY: deploy-apk
@@ -127,7 +129,7 @@ build-deb: clean build install-fpm
 test-deb-ci: install-test build-deb
 	@chmod +x "./utils/deb/deb-ci.sh"; sync; \
 	export SECRET_PROJECT_ROOT="${PWD}"; \
-	export PATH="${PWD}/vendor/bats/bin:${PATH}"; \
+	export PATH="${PWD}/vendor/bats-core/bin:${PATH}"; \
 	"./utils/deb/deb-ci.sh"
 
 .PHONY: deploy-deb
@@ -149,7 +151,7 @@ build-rpm: clean build install-fpm
 test-rpm-ci: install-test build-rpm
 	@chmod +x "./utils/rpm/rpm-ci.sh"; sync; \
 	export SECRET_PROJECT_ROOT="${PWD}"; \
-	export PATH="${PWD}/vendor/bats/bin:${PATH}"; \
+	export PATH="${PWD}/vendor/bats-core/bin:${PATH}"; \
 	"./utils/rpm/rpm-ci.sh"
 
 .PHONY: deploy-rpm
@@ -164,5 +166,5 @@ deploy-rpm: build-rpm
 test-make-ci: clean install-test
 	@chmod +x "./utils/make/make-ci.sh"; sync; \
 	export SECRET_PROJECT_ROOT="${PWD}"; \
-	export PATH="${PWD}/vendor/bats/bin:${PATH}"; \
+	export PATH="${PWD}/vendor/bats-core/bin:${PATH}"; \
 	"./utils/make/make-ci.sh"

tests/_test_base.bash

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # This file is following a name convention defined in:
-# https://github.com/sstephenson/bats
+# https://github.com/bats-core/bats-core
 
 # shellcheck disable=1090
 source "$SECRET_PROJECT_ROOT/src/version.sh"