From b6b9d38b5b554a1a8471c3a335786d8556ef8e7b Mon Sep 17 00:00:00 2001
From: Andrejus <hi@andrejus.uk>
Date: Mon, 28 Jun 2021 17:30:47 +0100
Subject: [PATCH] fix: Passing tests

---
 Dockerfile             | 10 +++++++---
 tests/run.sh           |  3 ++-
 tests/test_binaries.py |  3 ---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 421c046..36033a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,14 +15,17 @@ RUN adduser "test-user" sudo
 RUN echo "test-user ALL=(ALL) NOPASSWD: ALL" \
     >>/etc/sudoers
 
-
 #
 # source: Base image with source copied over
 #
 FROM debian-base AS source
 
 ARG DOTFILES_DIR="/home/test-user/.dotfiles"
-ADD --chown="test-user" . "$DOTFILES_DIR"
+RUN mkdir ${DOTFILES_DIR}
+RUN chown test-user ${DOTFILES_DIR}
+
+ADD --chown="test-user" files "$DOTFILES_DIR/files"
+ADD --chown="test-user" scripts "$DOTFILES_DIR/scripts"
 WORKDIR "$DOTFILES_DIR"
 
 
@@ -42,5 +45,6 @@ RUN ./scripts/install.sh
 #
 FROM install AS test
 
+ADD --chown="test-user" tests "$DOTFILES_DIR/tests"
 WORKDIR "${DOTFILES_DIR}/tests"
-ENTRYPOINT [ "${DOTFILES_DIR}/tests/run.sh" ]
+ENTRYPOINT [ "./run.sh" ]
diff --git a/tests/run.sh b/tests/run.sh
index defd17d..276287b 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-bash -l -c "poetry install && poetry run pytest"
+# pyenv install --skip-existing && pyenv shell
+poetry install && poetry run pytest
diff --git a/tests/test_binaries.py b/tests/test_binaries.py
index 427d160..3ed73cb 100644
--- a/tests/test_binaries.py
+++ b/tests/test_binaries.py
@@ -63,7 +63,6 @@ binaries: List[str] = [
     "poetry",
 
     # langauge: js
-    "nvm",
     "node",
     "npm",
     "yarn",
@@ -71,8 +70,6 @@ binaries: List[str] = [
     # language: java
     "java",
 
-    # langauge: ruby
-    "ruby"
 ]