Move loading of helper scripts to central file.

continuouspipe · Sep 20, 2017 · f544aa3 · f544aa3
1 parent cb637fc
commit f544aa3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -17,6 +17,7 @@ RUN apt-get update -qq \
  && chown -R build:build /usr/local/share/bats/
 
 COPY ./tests/plan.sh /usr/local/share/container/plan.sh
+COPY ./tests/bats/helper.bash /usr/local/share/bats/
 COPY . /app
 WORKDIR /app
 

diff --git a/tests/bats/helper.bash b/tests/bats/helper.bash
@@ -0,0 +1,4 @@
+#!/bin/bash
+load /usr/local/share/bats/bats-support/load.bash
+load /usr/local/share/bats/bats-assert/load.bash
+load /usr/local/share/bats/bats-mock/stub.bash
diff --git a/ubuntu/16.04/tests/common_functions.bats b/ubuntu/16.04/tests/common_functions.bats
@@ -1,5 +1,7 @@
 #!/usr/bin/env bats
 
+load /usr/local/share/bats/helper.bash
+
 # shellcheck source=../usr/local/share/bootstrap/common_functions.sh
 source "$BATS_TEST_DIRNAME/../usr/local/share/bootstrap/common_functions.sh"
 
@@ -9,10 +11,6 @@ function setup() {
   }
 }
 
-load /usr/local/share/bats/bats-support/load.bash
-load /usr/local/share/bats/bats-assert/load.bash
-load /usr/local/share/bats/bats-mock/stub.bash
-
 @test "escape_shell_args escapes spaces" {
   run escape_shell_args 'test test2'
   assert_success