From bde7a3ca90e0d617890179b521c02ff80b07e857 Mon Sep 17 00:00:00 2001
From: Josh Rabinowitz <joshr@joshr.com>
Date: Wed, 13 Jun 2018 12:03:25 -0400
Subject: [PATCH] migrate from bats to bats-core (redux)

---
 .ci/integration/tasks/dependencies.yml |  2 +-
 .ci/integration/tasks/prep-tests.yml   |  2 +-
 Makefile                               | 14 +++++++-------
 tests/_test_base.bash                  |  3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.ci/integration/tasks/dependencies.yml b/.ci/integration/tasks/dependencies.yml
index 1f090e94..ecad8381 100644
--- a/.ci/integration/tasks/dependencies.yml
+++ b/.ci/integration/tasks/dependencies.yml
@@ -14,7 +14,7 @@
 
 - name: Get bats
   git:
-    repo: 'https://github.com/sstephenson/bats.git'
+    repo: 'https://github.com/bats-core/bats-core.git'
     dest: /opt/bats
 
 - name: Install bats
diff --git a/.ci/integration/tasks/prep-tests.yml b/.ci/integration/tasks/prep-tests.yml
index 7adcab5b..043afe27 100644
--- a/.ci/integration/tasks/prep-tests.yml
+++ b/.ci/integration/tasks/prep-tests.yml
@@ -24,7 +24,7 @@
 
 - name: Print gpg version
   debug:
-    msg: "Running test againts {{ gpg_version.stdout_lines | first | string }}."
+    msg: "Running test against {{ gpg_version.stdout_lines | first | string }}."
   changed_when: False
 
 - name: Copy git-secret src
diff --git a/Makefile b/Makefile
index 38c3bac8..b2cc236e 100644
--- a/Makefile
+++ b/Makefile
@@ -35,14 +35,14 @@ 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; 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 +105,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 +127,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 +149,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 +164,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"
diff --git a/tests/_test_base.bash b/tests/_test_base.bash
index f2a76d35..aceb1879 100644
--- a/tests/_test_base.bash
+++ b/tests/_test_base.bash
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 # This file is following a name convention defined in:
-# https://github.com/sstephenson/bats
+#      https://github.com/sstephenson/bats 
+#  and https://github.com/bats-core/bats-core
 
 # shellcheck disable=1090
 source "$SECRET_PROJECT_ROOT/src/version.sh"