From 8e5000fb3147903a5bbe76a9b15aaab411396159 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 17 Sep 2018 10:09:49 +0200 Subject: [PATCH] moves files from /tests to more appropriate folders ref #11433 --- {tests/api => devenv/e2e-api-tests}/clearState.test.ts | 0 {tests/api => devenv/e2e-api-tests}/client.ts | 0 {tests/api => devenv/e2e-api-tests}/dashboard.test.ts | 0 {tests/api => devenv/e2e-api-tests}/folder.test.ts | 0 {tests/api => devenv/e2e-api-tests}/jest.js | 0 {tests/api => devenv/e2e-api-tests}/search.test.ts | 0 {tests/api => devenv/e2e-api-tests}/setup.ts | 0 {tests/api => devenv/e2e-api-tests}/tsconfig.json | 0 {tests/api => devenv/e2e-api-tests}/user.test.ts | 0 pkg/setting/setting_test.go | 8 ++++---- {tests/config-files => pkg/setting/testdata}/override.ini | 0 .../setting/testdata}/override_windows.ini | 0 12 files changed, 4 insertions(+), 4 deletions(-) rename {tests/api => devenv/e2e-api-tests}/clearState.test.ts (100%) rename {tests/api => devenv/e2e-api-tests}/client.ts (100%) rename {tests/api => devenv/e2e-api-tests}/dashboard.test.ts (100%) rename {tests/api => devenv/e2e-api-tests}/folder.test.ts (100%) rename {tests/api => devenv/e2e-api-tests}/jest.js (100%) rename {tests/api => devenv/e2e-api-tests}/search.test.ts (100%) rename {tests/api => devenv/e2e-api-tests}/setup.ts (100%) rename {tests/api => devenv/e2e-api-tests}/tsconfig.json (100%) rename {tests/api => devenv/e2e-api-tests}/user.test.ts (100%) rename {tests/config-files => pkg/setting/testdata}/override.ini (100%) rename {tests/config-files => pkg/setting/testdata}/override_windows.ini (100%) diff --git a/tests/api/clearState.test.ts b/devenv/e2e-api-tests/clearState.test.ts similarity index 100% rename from tests/api/clearState.test.ts rename to devenv/e2e-api-tests/clearState.test.ts diff --git a/tests/api/client.ts b/devenv/e2e-api-tests/client.ts similarity index 100% rename from tests/api/client.ts rename to devenv/e2e-api-tests/client.ts diff --git a/tests/api/dashboard.test.ts b/devenv/e2e-api-tests/dashboard.test.ts similarity index 100% rename from tests/api/dashboard.test.ts rename to devenv/e2e-api-tests/dashboard.test.ts diff --git a/tests/api/folder.test.ts b/devenv/e2e-api-tests/folder.test.ts similarity index 100% rename from tests/api/folder.test.ts rename to devenv/e2e-api-tests/folder.test.ts diff --git a/tests/api/jest.js b/devenv/e2e-api-tests/jest.js similarity index 100% rename from tests/api/jest.js rename to devenv/e2e-api-tests/jest.js diff --git a/tests/api/search.test.ts b/devenv/e2e-api-tests/search.test.ts similarity index 100% rename from tests/api/search.test.ts rename to devenv/e2e-api-tests/search.test.ts diff --git a/tests/api/setup.ts b/devenv/e2e-api-tests/setup.ts similarity index 100% rename from tests/api/setup.ts rename to devenv/e2e-api-tests/setup.ts diff --git a/tests/api/tsconfig.json b/devenv/e2e-api-tests/tsconfig.json similarity index 100% rename from tests/api/tsconfig.json rename to devenv/e2e-api-tests/tsconfig.json diff --git a/tests/api/user.test.ts b/devenv/e2e-api-tests/user.test.ts similarity index 100% rename from tests/api/user.test.ts rename to devenv/e2e-api-tests/user.test.ts diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go index affb3c3e7ca..9b19b6c6bfa 100644 --- a/pkg/setting/setting_test.go +++ b/pkg/setting/setting_test.go @@ -97,7 +97,7 @@ func TestLoadingSettings(t *testing.T) { Args: []string{ "cfg:default.server.domain=test2", }, - Config: filepath.Join(HomePath, "tests/config-files/override.ini"), + Config: filepath.Join(HomePath, "pkg/setting/testdata/override.ini"), }) So(Domain, ShouldEqual, "test2") @@ -108,7 +108,7 @@ func TestLoadingSettings(t *testing.T) { cfg := NewCfg() cfg.Load(&CommandLineArgs{ HomePath: "../../", - Config: filepath.Join(HomePath, "tests/config-files/override_windows.ini"), + Config: filepath.Join(HomePath, "pkg/setting/testdata/override_windows.ini"), Args: []string{`cfg:default.paths.data=c:\tmp\data`}, }) @@ -117,7 +117,7 @@ func TestLoadingSettings(t *testing.T) { cfg := NewCfg() cfg.Load(&CommandLineArgs{ HomePath: "../../", - Config: filepath.Join(HomePath, "tests/config-files/override.ini"), + Config: filepath.Join(HomePath, "pkg/setting/testdata/override.ini"), Args: []string{"cfg:default.paths.data=/tmp/data"}, }) @@ -139,7 +139,7 @@ func TestLoadingSettings(t *testing.T) { cfg := NewCfg() cfg.Load(&CommandLineArgs{ HomePath: "../../", - Config: filepath.Join(HomePath, "tests/config-files/override.ini"), + Config: filepath.Join(HomePath, "pkg/setting/testdata/override.ini"), Args: []string{"cfg:paths.data=/tmp/data"}, }) diff --git a/tests/config-files/override.ini b/pkg/setting/testdata/override.ini similarity index 100% rename from tests/config-files/override.ini rename to pkg/setting/testdata/override.ini diff --git a/tests/config-files/override_windows.ini b/pkg/setting/testdata/override_windows.ini similarity index 100% rename from tests/config-files/override_windows.ini rename to pkg/setting/testdata/override_windows.ini