From 19529408f4b81173d0a7ab059dbe97ebc8c261ac Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Sun, 12 Jan 2020 18:59:35 +0000
Subject: [PATCH] :lipstick: Rename 'test' directory to 'tests'.
---
backend/bin/kaocha | 2 --
backend/deps.edn | 15 ++++++++++-----
backend/{test => tests}/user.clj | 3 +++
.../uxbox/tests/_files/sample.jpg | Bin
.../uxbox/tests/_files/sample1.svg | 0
.../uxbox/tests/_files/sample2.svg | 0
backend/{test => tests}/uxbox/tests/helpers.clj | 2 --
.../{test => tests}/uxbox/tests/test_emails.clj | 0
.../{test => tests}/uxbox/tests/test_icons.clj | 0
.../{test => tests}/uxbox/tests/test_images.clj | 0
.../uxbox/tests/test_services_auth.clj | 0
.../uxbox/tests/test_services_project_files.clj | 0
.../uxbox/tests/test_services_project_pages.clj | 0
.../uxbox/tests/test_services_projects.clj | 0
.../uxbox/tests/test_services_user_attrs.clj | 0
.../uxbox/tests/test_services_users.clj | 0
.../uxbox/tests/test_util_svg.clj | 0
17 files changed, 13 insertions(+), 9 deletions(-)
delete mode 100755 backend/bin/kaocha
rename backend/{test => tests}/user.clj (98%)
rename backend/{test => tests}/uxbox/tests/_files/sample.jpg (100%)
rename backend/{test => tests}/uxbox/tests/_files/sample1.svg (100%)
rename backend/{test => tests}/uxbox/tests/_files/sample2.svg (100%)
rename backend/{test => tests}/uxbox/tests/helpers.clj (98%)
rename backend/{test => tests}/uxbox/tests/test_emails.clj (100%)
rename backend/{test => tests}/uxbox/tests/test_icons.clj (100%)
rename backend/{test => tests}/uxbox/tests/test_images.clj (100%)
rename backend/{test => tests}/uxbox/tests/test_services_auth.clj (100%)
rename backend/{test => tests}/uxbox/tests/test_services_project_files.clj (100%)
rename backend/{test => tests}/uxbox/tests/test_services_project_pages.clj (100%)
rename backend/{test => tests}/uxbox/tests/test_services_projects.clj (100%)
rename backend/{test => tests}/uxbox/tests/test_services_user_attrs.clj (100%)
rename backend/{test => tests}/uxbox/tests/test_services_users.clj (100%)
rename backend/{test => tests}/uxbox/tests/test_util_svg.clj (100%)
diff --git a/backend/bin/kaocha b/backend/bin/kaocha
deleted file mode 100755
index 4a31cbf77..000000000
--- a/backend/bin/kaocha
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-clojure -A:dev:test -m kaocha.runner "$@"
diff --git a/backend/deps.edn b/backend/deps.edn
index 96af93601..656ce16d2 100644
--- a/backend/deps.edn
+++ b/backend/deps.edn
@@ -1,4 +1,8 @@
-{:deps
+{:mvn/repos
+ {"central" {:url "https://repo1.maven.org/maven2/"}
+ "clojars" {:url "https://clojars.org/repo"}
+ "jcenter" {:url "https://jcenter.bintray.com/"}}
+ :deps
{org.clojure/clojure {:mvn/version "1.10.1"}
funcool/promesa {:mvn/version "5.0.0"}
funcool/cuerdas {:mvn/version "2.2.1"}
@@ -44,7 +48,7 @@
mount/mount {:mvn/version "0.1.16"}
environ/environ {:mvn/version "1.1.0"}}
- :paths ["src" "vendor" "resources" "../common"]
+ :paths ["src" "resources" "../common"]
:aliases
{:dev
{:extra-deps
@@ -53,13 +57,14 @@
fipp/fipp {:mvn/version "0.6.21"}
criterium/criterium {:mvn/version "0.4.5"}
mockery/mockery {:mvn/version "0.1.4"}}
- :extra-paths ["test"]}
+ :extra-paths ["tests"]}
:repl
{:main-opts ["-m" "rebel-readline.main"]}
- :test
- {:extra-deps {lambdaisland/kaocha {:mvn/version "0.0-565"}}}
+ :tests
+ {:extra-deps {lambdaisland/kaocha {:mvn/version "0.0-565"}}
+ :main-opts ["-m" "kaocha.runner"]}
:ancient
{:main-opts ["-m" "deps-ancient.deps-ancient"]
diff --git a/backend/test/user.clj b/backend/tests/user.clj
similarity index 98%
rename from backend/test/user.clj
rename to backend/tests/user.clj
index b9700ed1f..394cd2a2f 100644
--- a/backend/test/user.clj
+++ b/backend/tests/user.clj
@@ -2,6 +2,9 @@
;; License, v. 2.0. If a copy of the MPL was not distributed with this
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
;; Copyright (c) 2016-2019 Andrey Antukh <niwi@niwi.nz>
(ns user
diff --git a/backend/test/uxbox/tests/_files/sample.jpg b/backend/tests/uxbox/tests/_files/sample.jpg
similarity index 100%
rename from backend/test/uxbox/tests/_files/sample.jpg
rename to backend/tests/uxbox/tests/_files/sample.jpg
diff --git a/backend/test/uxbox/tests/_files/sample1.svg b/backend/tests/uxbox/tests/_files/sample1.svg
similarity index 100%
rename from backend/test/uxbox/tests/_files/sample1.svg
rename to backend/tests/uxbox/tests/_files/sample1.svg
diff --git a/backend/test/uxbox/tests/_files/sample2.svg b/backend/tests/uxbox/tests/_files/sample2.svg
similarity index 100%
rename from backend/test/uxbox/tests/_files/sample2.svg
rename to backend/tests/uxbox/tests/_files/sample2.svg
diff --git a/backend/test/uxbox/tests/helpers.clj b/backend/tests/uxbox/tests/helpers.clj
similarity index 98%
rename from backend/test/uxbox/tests/helpers.clj
rename to backend/tests/uxbox/tests/helpers.clj
index 2f1a8fcbf..195b33f81 100644
--- a/backend/test/uxbox/tests/helpers.clj
+++ b/backend/tests/uxbox/tests/helpers.clj
@@ -1,7 +1,6 @@
(ns uxbox.tests.helpers
(:require
[clojure.spec.alpha :as s]
- [buddy.hashers :as hashers]
[promesa.core :as p]
[cuerdas.core :as str]
[mount.core :as mount]
@@ -22,7 +21,6 @@
[next]
(let [config (cfg/read-test-config)]
(-> (mount/only #{#'uxbox.config/config
- #'uxbox.config/secret
#'uxbox.core/system
#'uxbox.db/pool
#'uxbox.services.init/query-services
diff --git a/backend/test/uxbox/tests/test_emails.clj b/backend/tests/uxbox/tests/test_emails.clj
similarity index 100%
rename from backend/test/uxbox/tests/test_emails.clj
rename to backend/tests/uxbox/tests/test_emails.clj
diff --git a/backend/test/uxbox/tests/test_icons.clj b/backend/tests/uxbox/tests/test_icons.clj
similarity index 100%
rename from backend/test/uxbox/tests/test_icons.clj
rename to backend/tests/uxbox/tests/test_icons.clj
diff --git a/backend/test/uxbox/tests/test_images.clj b/backend/tests/uxbox/tests/test_images.clj
similarity index 100%
rename from backend/test/uxbox/tests/test_images.clj
rename to backend/tests/uxbox/tests/test_images.clj
diff --git a/backend/test/uxbox/tests/test_services_auth.clj b/backend/tests/uxbox/tests/test_services_auth.clj
similarity index 100%
rename from backend/test/uxbox/tests/test_services_auth.clj
rename to backend/tests/uxbox/tests/test_services_auth.clj
diff --git a/backend/test/uxbox/tests/test_services_project_files.clj b/backend/tests/uxbox/tests/test_services_project_files.clj
similarity index 100%
rename from backend/test/uxbox/tests/test_services_project_files.clj
rename to backend/tests/uxbox/tests/test_services_project_files.clj
diff --git a/backend/test/uxbox/tests/test_services_project_pages.clj b/backend/tests/uxbox/tests/test_services_project_pages.clj
similarity index 100%
rename from backend/test/uxbox/tests/test_services_project_pages.clj
rename to backend/tests/uxbox/tests/test_services_project_pages.clj
diff --git a/backend/test/uxbox/tests/test_services_projects.clj b/backend/tests/uxbox/tests/test_services_projects.clj
similarity index 100%
rename from backend/test/uxbox/tests/test_services_projects.clj
rename to backend/tests/uxbox/tests/test_services_projects.clj
diff --git a/backend/test/uxbox/tests/test_services_user_attrs.clj b/backend/tests/uxbox/tests/test_services_user_attrs.clj
similarity index 100%
rename from backend/test/uxbox/tests/test_services_user_attrs.clj
rename to backend/tests/uxbox/tests/test_services_user_attrs.clj
diff --git a/backend/test/uxbox/tests/test_services_users.clj b/backend/tests/uxbox/tests/test_services_users.clj
similarity index 100%
rename from backend/test/uxbox/tests/test_services_users.clj
rename to backend/tests/uxbox/tests/test_services_users.clj
diff --git a/backend/test/uxbox/tests/test_util_svg.clj b/backend/tests/uxbox/tests/test_util_svg.clj
similarity index 100%
rename from backend/test/uxbox/tests/test_util_svg.clj
rename to backend/tests/uxbox/tests/test_util_svg.clj