Merge pull request #67 from MichaelDimmitt/move-imports-for-test-suite-to-helper-file

pimterry · web-flow · commit 46780aed8c25 · 2019-04-21T21:25:25.000+02:00
Move repeated import: bats-assert and bats-support to helper file
diff --git a/test/helpers.bash b/test/helpers.bash
@@ -1,3 +1,6 @@
+load 'libs/bats-support/load'
+load 'libs/bats-assert/load'
+
 assert_exists() {
   assert [ -e "$1" ]
 }
diff --git a/test/test-base.bats b/test/test-base.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {
diff --git a/test/test-bash-completion.bats b/test/test-bash-completion.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {
diff --git a/test/test-cat.bats b/test/test-cat.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {
diff --git a/test/test-config.bats b/test/test-config.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {
diff --git a/test/test-find.bats b/test/test-find.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {
diff --git a/test/test-grep.bats b/test/test-grep.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {
diff --git a/test/test-help.bats b/test/test-help.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {
diff --git a/test/test-ls.bats b/test/test-ls.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {
diff --git a/test/test-new.bats b/test/test-new.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {
diff --git a/test/test-open.bats b/test/test-open.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 function open() { echo "Opening $*"; }
diff --git a/test/test-rm.bats b/test/test-rm.bats
@@ -1,7 +1,5 @@
 #!./test/libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {
diff --git a/test/test-search.bats b/test/test-search.bats
@@ -1,7 +1,5 @@
 #!./libs/bats/bin/bats
 
-load 'libs/bats-support/load'
-load 'libs/bats-assert/load'
 load 'helpers'
 
 setup() {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+load 'libs/bats-support/load'`
	`2`	`+load 'libs/bats-assert/load'`
	`3`	`+`
`1`	`4`	`assert_exists() {`
`2`	`5`	`assert [ -e "$1" ]`
`3`	`6`	`}`