From 54b7edfb515c9ab45e033a6aeaf61331f258257c Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 10 Jun 2020 12:06:32 +0300 Subject: [PATCH] fix import paths, part 2 --- build/download_helm.ts | 2 +- spec/src/common/cluster-store_spec.ts | 5 ++--- spec/src/common/user-store_spec.ts | 2 +- spec/src/main/kubectl_spec.ts | 2 +- spec/src/main/port_spec.ts | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build/download_helm.ts b/build/download_helm.ts index a379e1c728..2f81b14583 100644 --- a/build/download_helm.ts +++ b/build/download_helm.ts @@ -1,3 +1,3 @@ -import { helmCli } from "../main/helm-cli" +import { helmCli } from "../src/main/helm-cli" helmCli.ensureBinary() diff --git a/spec/src/common/cluster-store_spec.ts b/spec/src/common/cluster-store_spec.ts index ec152a111c..f2e5a69c5b 100644 --- a/spec/src/common/cluster-store_spec.ts +++ b/spec/src/common/cluster-store_spec.ts @@ -1,5 +1,7 @@ import mockFs from "mock-fs" import yaml from "js-yaml" +import { ClusterStore } from "../../../src/common/cluster-store"; +import { Cluster } from "../../../src/main/cluster"; jest.mock("electron", () => { return { @@ -14,9 +16,6 @@ jest.mock("electron", () => { // Console.log needs to be called before fs-mocks, see https://github.com/tschaub/mock-fs/issues/234 console.log(""); -import { ClusterStore } from "../../../common/cluster-store" -import { Cluster } from "../../../main/cluster" - describe("for an empty config", () => { beforeEach(() => { ClusterStore.resetInstance() diff --git a/spec/src/common/user-store_spec.ts b/spec/src/common/user-store_spec.ts index 88b4518fd7..d6c06ad91c 100644 --- a/spec/src/common/user-store_spec.ts +++ b/spec/src/common/user-store_spec.ts @@ -1,5 +1,5 @@ import mockFs from "mock-fs" -import { userStore, UserStore } from "../../../common/user-store" +import { userStore, UserStore } from "../../../src/common/user-store" jest.mock("electron", () => { return { diff --git a/spec/src/main/kubectl_spec.ts b/spec/src/main/kubectl_spec.ts index fbd2672fc2..bd95b3c072 100644 --- a/spec/src/main/kubectl_spec.ts +++ b/spec/src/main/kubectl_spec.ts @@ -1,4 +1,4 @@ -import { bundledKubectl, Kubectl } from "../../../main/kubectl"; +import { bundledKubectl, Kubectl } from "../../../src/main/kubectl"; jest.mock("electron") jest.mock("../../../common/user-store") diff --git a/spec/src/main/port_spec.ts b/spec/src/main/port_spec.ts index 841c42fa8d..8c7566e02c 100644 --- a/spec/src/main/port_spec.ts +++ b/spec/src/main/port_spec.ts @@ -15,7 +15,7 @@ class MockServer extends EventEmitter { const net = require("net") jest.mock("net") -import * as port from "../../../main/port" +import * as port from "../../../src/main/port" describe("getFreePort", () => { beforeEach(() => {