Revert "[server] Temporarily disable broken bitbucket tests"

This reverts commit 1f9e9e8.

Author: iQQBot

components/server/src/bitbucket-server/bitbucket-server-api.spec.ts

@@ -5,6 +5,7 @@
  */
 
 import { User } from "@gitpod/gitpod-protocol";
+import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if";
 import { Container, ContainerModule } from "inversify";
 import { retries, skip, suite, test, timeout } from "@testdeck/mocha";
 import { expect } from "chai";
@@ -18,7 +19,7 @@ import { TokenProvider } from "../user/token-provider";
 import { BitbucketServerApi } from "./bitbucket-server-api";
 import { HostContextProvider } from "../auth/host-context-provider";
 
-@suite(timeout(10000), retries(0), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/)
+@suite(timeout(10000), retries(0), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER")))
 class TestBitbucketServerApi {
     protected api: BitbucketServerApi;
     protected user: User;

components/server/src/bitbucket-server/bitbucket-server-context-parser.spec.ts

@@ -5,6 +5,7 @@
  */
 
 import { User } from "@gitpod/gitpod-protocol";
+import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if";
 import { Container, ContainerModule } from "inversify";
 import { skip, suite, test, timeout } from "@testdeck/mocha";
 import { expect } from "chai";
@@ -20,7 +21,7 @@ import { BitbucketServerApi } from "./bitbucket-server-api";
 import { HostContextProvider } from "../auth/host-context-provider";
 import { URL } from "url";
 
-@suite(timeout(10000), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/)
+@suite(timeout(10000), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER")))
 class TestBitbucketServerContextParser {
     protected parser: BitbucketServerContextParser;
     protected user: User;

components/server/src/bitbucket-server/bitbucket-server-file-provider.spec.ts

@@ -5,6 +5,7 @@
  */
 
 import { Repository, User } from "@gitpod/gitpod-protocol";
+import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if";
 import { Container, ContainerModule } from "inversify";
 import { retries, skip, suite, test, timeout } from "@testdeck/mocha";
 import { expect } from "chai";
@@ -19,7 +20,7 @@ import { TokenProvider } from "../user/token-provider";
 import { BitbucketServerApi } from "./bitbucket-server-api";
 import { HostContextProvider } from "../auth/host-context-provider";
 
-@suite(timeout(10000), retries(1), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/)
+@suite(timeout(10000), retries(1), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER")))
 class TestBitbucketServerFileProvider {
     protected service: BitbucketServerFileProvider;
     protected user: User;

components/server/src/bitbucket-server/bitbucket-server-repository-provider.spec.ts

@@ -5,6 +5,7 @@
  */
 
 import { User } from "@gitpod/gitpod-protocol";
+import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if";
 import { Container, ContainerModule } from "inversify";
 import { retries, skip, suite, test, timeout } from "@testdeck/mocha";
 import { expect } from "chai";
@@ -19,7 +20,7 @@ import { BitbucketServerApi } from "./bitbucket-server-api";
 import { HostContextProvider } from "../auth/host-context-provider";
 import { BitbucketServerRepositoryProvider } from "./bitbucket-server-repository-provider";
 
-@suite(timeout(10000), retries(0), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/)
+@suite(timeout(10000), retries(0), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER")))
 class TestBitbucketServerRepositoryProvider {
     protected service: BitbucketServerRepositoryProvider;
     protected user: User;

components/server/src/bitbucket-server/bitbucket-server-token-validator.spec.ts

@@ -4,6 +4,7 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
+import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if";
 import { Container, ContainerModule } from "inversify";
 import { retries, skip, suite, test, timeout } from "@testdeck/mocha";
 import { expect } from "chai";
@@ -14,12 +15,12 @@ import { BitbucketServerTokenHelper } from "./bitbucket-server-token-handler";
 import { TokenProvider } from "../user/token-provider";
 import { IGitTokenValidatorParams } from "../workspace/git-token-validator";
 
-// const shouldSkip =
-//     ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ") &&
-//     ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE") &&
-//     ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN");
+const shouldSkip =
+    ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ") &&
+    ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE") &&
+    ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN");
 
-@suite(timeout(10000), retries(0), skip(true) /*skip(shouldSkip)*/)
+@suite(timeout(10000), retries(0), skip(shouldSkip))
 class TestBitbucketServerTokenValidator {
     static readonly AUTH_HOST_CONFIG: Partial<AuthProviderParams> = {
         id: "MyBitbucketServer",
@@ -68,8 +69,7 @@ class TestBitbucketServerTokenValidator {
         return container.get(BitbucketServerTokenValidator);
     }
 
-    @test(skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ"))*/)
-    async test_checkWriteAccess_read_only() {
+    @test(skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ"))) async test_checkWriteAccess_read_only() {
         const token = process.env["GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ"]!;
         const result = await this.getValidator(token).checkWriteAccess(Object.assign({}, this.checkParams, { token }));
         expect(result).to.deep.equal({
@@ -79,7 +79,7 @@ class TestBitbucketServerTokenValidator {
         });
     }
 
-    @test(skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE"))*/)
+    @test(skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE")))
     async test_checkWriteAccess_write_permissions() {
         const token = process.env["GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE"]!;
         const result = await this.getValidator(token).checkWriteAccess(Object.assign({}, this.checkParams, { token }));
@@ -90,7 +90,7 @@ class TestBitbucketServerTokenValidator {
         });
     }
 
-    @test(skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"))*/)
+    @test(skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN")))
     async test_checkWriteAccess_admin_permissions() {
         const token = process.env["GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"]!;
         const result = await this.getValidator(token).checkWriteAccess(Object.assign({}, this.checkParams, { token }));