@cubejs-backend/testing 0.29.30 → 0.29.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/birdbox-fixtures/athena.yml +11 -3
  3. package/birdbox-fixtures/bigquery.yml +11 -4
  4. package/birdbox-fixtures/postgresql/schema/OrdersPA.js +25 -14
  5. package/birdbox-fixtures/questdb/schema/Events.js +49 -0
  6. package/birdbox-fixtures/questdb/schema/Orders.js +34 -0
  7. package/birdbox-fixtures/questdb/scripts/questdb-load-events.sh +19 -0
  8. package/birdbox-fixtures/questdb.yml +43 -0
  9. package/dist/src/birdbox.d.ts +2 -3
  10. package/dist/src/birdbox.d.ts.map +1 -1
  11. package/dist/src/birdbox.js +25 -19
  12. package/dist/src/birdbox.js.map +1 -1
  13. package/dist/src/index.d.ts +0 -1
  14. package/dist/src/index.d.ts.map +1 -1
  15. package/dist/src/index.js +0 -1
  16. package/dist/src/index.js.map +1 -1
  17. package/package.json +17 -12
  18. package/dist/src/db/cubestore.d.ts +0 -9
  19. package/dist/src/db/cubestore.d.ts.map +0 -1
  20. package/dist/src/db/cubestore.js +0 -22
  21. package/dist/src/db/cubestore.js.map +0 -1
  22. package/dist/src/db/db-runner.abstract.d.ts +0 -11
  23. package/dist/src/db/db-runner.abstract.d.ts.map +0 -1
  24. package/dist/src/db/db-runner.abstract.js +0 -8
  25. package/dist/src/db/db-runner.abstract.js.map +0 -1
  26. package/dist/src/db/index.d.ts +0 -5
  27. package/dist/src/db/index.d.ts.map +0 -1
  28. package/dist/src/db/index.js +0 -17
  29. package/dist/src/db/index.js.map +0 -1
  30. package/dist/src/db/mysql.d.ts +0 -9
  31. package/dist/src/db/mysql.d.ts.map +0 -1
  32. package/dist/src/db/mysql.js +0 -37
  33. package/dist/src/db/mysql.js.map +0 -1
  34. package/dist/src/db/postgres.d.ts +0 -9
  35. package/dist/src/db/postgres.d.ts.map +0 -1
  36. package/dist/src/db/postgres.js +0 -33
  37. package/dist/src/db/postgres.js.map +0 -1
  38. package/dist/src/db/questdb.d.ts +0 -9
  39. package/dist/src/db/questdb.d.ts.map +0 -1
  40. package/dist/src/db/questdb.js +0 -22
  41. package/dist/src/db/questdb.js.map +0 -1
  42. package/dist/src/testing/DriverTests.d.ts +0 -26
  43. package/dist/src/testing/DriverTests.d.ts.map +0 -1
  44. package/dist/src/testing/DriverTests.js +0 -107
  45. package/dist/src/testing/DriverTests.js.map +0 -1
  46. package/dist/src/testing/index.d.ts +0 -3
  47. package/dist/src/testing/index.d.ts.map +0 -1
  48. package/dist/src/testing/index.js +0 -15
  49. package/dist/src/testing/index.js.map +0 -1
  50. package/dist/src/testing/query-test.abstract.d.ts +0 -25
  51. package/dist/src/testing/query-test.abstract.d.ts.map +0 -1
  52. package/dist/src/testing/query-test.abstract.js +0 -123
  53. package/dist/src/testing/query-test.abstract.js.map +0 -1
  54. package/dist/src/utils.d.ts +0 -9
  55. package/dist/src/utils.d.ts.map +0 -1
  56. package/dist/src/utils.js +0 -61
  57. package/dist/src/utils.js.map +0 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,33 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [0.29.35](https://github.com/cube-js/cube.js/compare/v0.29.34...v0.29.35) (2022-03-24)
7
+
8
+ **Note:** Version bump only for package @cubejs-backend/testing
9
+
10
+
11
+
12
+
13
+
14
+ ## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
15
+
16
+ **Note:** Version bump only for package @cubejs-backend/testing
17
+
18
+
19
+
20
+
21
+
22
+ ## [0.29.31](https://github.com/cube-js/cube.js/compare/v0.29.30...v0.29.31) (2022-03-09)
23
+
24
+
25
+ ### Bug Fixes
26
+
27
+ * **athena:** Fixes export bucket location. Fixes column order. ([#4183](https://github.com/cube-js/cube.js/issues/4183)) ([abd40a7](https://github.com/cube-js/cube.js/commit/abd40a79e360cd9a9eceeb56a450102bd782f3d9))
28
+
29
+
30
+
31
+
32
+
6
33
  ## [0.29.30](https://github.com/cube-js/cube.js/compare/v0.29.29...v0.29.30) (2022-03-04)
7
34
 
8
35
 
@@ -6,18 +6,26 @@ services:
6
6
  image: ${BIRDBOX_CUBEJS_REGISTRY_PATH}cubejs/cube:${BIRDBOX_CUBEJS_VERSION:-latest}
7
7
  environment:
8
8
  CUBEJS_DB_TYPE: athena
9
+
10
+ # from env
9
11
  CUBEJS_AWS_KEY: ${CUBEJS_AWS_KEY}
10
12
  CUBEJS_AWS_SECRET: ${CUBEJS_AWS_SECRET}
11
13
  CUBEJS_AWS_REGION: ${CUBEJS_AWS_REGION}
12
14
  CUBEJS_AWS_S3_OUTPUT_LOCATION: ${CUBEJS_AWS_S3_OUTPUT_LOCATION}
15
+ CUBEJS_DB_EXPORT_BUCKET: ${CUBEJS_DB_EXPORT_BUCKET}
16
+
17
+ # from test
18
+ CUBEJS_SCHEDULED_REFRESH_DEFAULT: ${CUBEJS_SCHEDULED_REFRESH_DEFAULT}
19
+ CUBEJS_REFRESH_WORKER: ${CUBEJS_REFRESH_WORKER}
20
+ CUBEJS_EXTERNAL_DEFAULT: ${CUBEJS_EXTERNAL_DEFAULT}
21
+ CUBEJS_ROLLUP_ONLY: ${CUBEJS_ROLLUP_ONLY}
13
22
 
23
+ # defaults
14
24
  CUBEJS_DEV_MODE: "true"
15
25
  CUBEJS_API_SECRET: mysupersecret
16
- CUBEJS_SCHEDULED_REFRESH_DEFAULT: "false"
17
- CUBEJS_REFRESH_WORKER: "false"
18
26
  volumes:
19
27
  - ./postgresql/single/cube.js:/cube/conf/cube.js
20
- - ./postgresql/schema:/cube/conf/schema
28
+ - ./postgresql/schema/OrdersPA.js:/cube/conf/schema/OrdersPA.js
21
29
  ports:
22
30
  - "4000:4000"
23
31
  restart: always
@@ -6,17 +6,24 @@ services:
6
6
  image: ${BIRDBOX_CUBEJS_REGISTRY_PATH}cubejs/cube:${BIRDBOX_CUBEJS_VERSION:-latest}
7
7
  environment:
8
8
  CUBEJS_DB_TYPE: bigquery
9
+
10
+ # from env
9
11
  CUBEJS_DB_BQ_PROJECT_ID: ${CUBEJS_DB_BQ_PROJECT_ID}
10
12
  CUBEJS_DB_BQ_CREDENTIALS: ${CUBEJS_DB_BQ_CREDENTIALS}
11
- CUBEJS_DB_BQ_EXPORT_BUCKET: ${CUBEJS_DB_BQ_EXPORT_BUCKET}
13
+ CUBEJS_DB_EXPORT_BUCKET: ${CUBEJS_DB_EXPORT_BUCKET}
14
+
15
+ # from test
16
+ CUBEJS_SCHEDULED_REFRESH_DEFAULT: ${CUBEJS_SCHEDULED_REFRESH_DEFAULT}
17
+ CUBEJS_REFRESH_WORKER: ${CUBEJS_REFRESH_WORKER}
18
+ CUBEJS_EXTERNAL_DEFAULT: ${CUBEJS_EXTERNAL_DEFAULT}
19
+ CUBEJS_ROLLUP_ONLY: ${CUBEJS_ROLLUP_ONLY}
12
20
 
21
+ # defaults
13
22
  CUBEJS_DEV_MODE: "true"
14
23
  CUBEJS_API_SECRET: mysupersecret
15
- CUBEJS_SCHEDULED_REFRESH_DEFAULT: "false"
16
- CUBEJS_REFRESH_WORKER: "false"
17
24
  volumes:
18
25
  - ./postgresql/single/cube.js:/cube/conf/cube.js
19
- - ./postgresql/schema:/cube/conf/schema
26
+ - ./postgresql/schema/OrdersPA.js:/cube/conf/schema/OrdersPA.js
20
27
  ports:
21
28
  - "4000:4000"
22
29
  restart: always
@@ -1,23 +1,23 @@
1
1
  cube(`OrdersPA`, {
2
2
  sql: `
3
- select 1 as id, 100 as amount, 'new' status
3
+ select 1 as id2, 100.1 as amount2, 'new' as status2, 1 as id, 100.1 as amount, 'new' as status
4
4
  UNION ALL
5
- select 2 as id, 200 as amount, 'new' status
5
+ select 2 as id2, 200.2 as amount2, 'new' as status2, 2 as id, 200.2 as amount, 'new' as status
6
6
  UNION ALL
7
- select 3 as id, 300 as amount, 'processed' status
7
+ select 3 as id2, 300.3 as amount2, 'processed' as status2, 3 as id, 300.3 as amount, 'processed' as status
8
8
  UNION ALL
9
- select 4 as id, 500 as amount, 'processed' status
9
+ select 4 as id2, 500.5 as amount2, 'processed' as status2, 4 as id, 500.5 as amount, 'processed' as status
10
10
  UNION ALL
11
- select 5 as id, 600 as amount, 'shipped' status
11
+ select 5 as id2, 600.6 as amount2, 'shipped' as status2, 5 as id, 600.6 as amount, 'shipped' as status
12
12
  `,
13
13
 
14
14
  preAggregations: {
15
15
  orderStatus: {
16
- measures: [CUBE.totalAmount],
17
- dimensions: [CUBE.status],
16
+ measures: [CUBE.amount, CUBE.amount2],
17
+ dimensions: [CUBE.id, CUBE.status, CUBE.id2, CUBE.status2],
18
18
  indexes: {
19
19
  categoryIndex: {
20
- columns: [CUBE.status],
20
+ columns: [CUBE.status, CUBE.status2],
21
21
  },
22
22
  },
23
23
  refreshKey: {
@@ -27,21 +27,32 @@ cube(`OrdersPA`, {
27
27
  },
28
28
 
29
29
  measures: {
30
- count: {
31
- type: `count`,
32
- },
33
- totalAmount: {
30
+ amount: {
34
31
  sql: `amount`,
35
32
  type: `sum`,
36
33
  },
37
- toRemove: {
38
- type: `count`,
34
+ amount2: {
35
+ sql: `amount2`,
36
+ type: `sum`,
39
37
  },
40
38
  },
39
+
41
40
  dimensions: {
41
+ id: {
42
+ sql: `id`,
43
+ type: `number`,
44
+ },
42
45
  status: {
43
46
  sql: `status`,
44
47
  type: `string`,
45
48
  },
49
+ id2: {
50
+ sql: `id2`,
51
+ type: `number`,
52
+ },
53
+ status2: {
54
+ sql: `status`,
55
+ type: `string`,
56
+ },
46
57
  },
47
58
  });
@@ -0,0 +1,49 @@
1
+ cube(`Events`, {
2
+ sql: `SELECT * FROM events`,
3
+
4
+ joins: {
5
+
6
+ },
7
+
8
+ measures: {
9
+ count: {
10
+ type: `count`,
11
+ drillMembers: [id, createdAt]
12
+ }
13
+ },
14
+
15
+ dimensions: {
16
+ actor: {
17
+ sql: `actor`,
18
+ type: `string`
19
+ },
20
+
21
+ public: {
22
+ sql: `public`,
23
+ type: `string`
24
+ },
25
+
26
+ id: {
27
+ sql: `id`,
28
+ type: `number`,
29
+ primaryKey: true
30
+ },
31
+
32
+ type: {
33
+ sql: `type`,
34
+ type: `string`
35
+ },
36
+
37
+ payload: {
38
+ sql: `payload`,
39
+ type: `string`
40
+ },
41
+
42
+ createdAt: {
43
+ sql: `created_at`,
44
+ type: `time`
45
+ }
46
+ },
47
+
48
+ dataSource: `default`
49
+ });
@@ -0,0 +1,34 @@
1
+ cube(`Orders`, {
2
+ sql: `
3
+ with orders as (
4
+ select 1 as id, 100 as amount, 'new' status
5
+ UNION ALL
6
+ select 2 as id, 200 as amount, 'new' status
7
+ UNION ALL
8
+ select 3 as id, 300 as amount, 'processed' status
9
+ UNION ALL
10
+ select 4 as id, 500 as amount, 'processed' status
11
+ UNION ALL
12
+ select 5 as id, 600 as amount, 'shipped' status
13
+ )
14
+ select * from orders
15
+ `,
16
+ measures: {
17
+ count: {
18
+ type: `count`,
19
+ },
20
+ totalAmount: {
21
+ sql: `amount`,
22
+ type: `sum`,
23
+ },
24
+ toRemove: {
25
+ type: `count`,
26
+ },
27
+ },
28
+ dimensions: {
29
+ status: {
30
+ sql: `status`,
31
+ type: `string`,
32
+ },
33
+ },
34
+ });
@@ -0,0 +1,19 @@
1
+ #!/bin/bash
2
+ exec 2>&1
3
+ set -x
4
+ set -e
5
+
6
+ apt-get update
7
+ apt-get install curl -y
8
+
9
+ echo $(pwd)
10
+ echo $(ls /data)
11
+
12
+ curl -F schema='[
13
+ {"name":"id", "type": "LONG"},
14
+ {"name":"type", "type": "SYMBOL"},
15
+ {"name":"actor", "type": "STRING"},
16
+ {"name":"public", "type": "SYMBOL"},
17
+ {"name":"created_at", "type": "TIMESTAMP", "pattern": "yyyy-MM-dd HH:mm:ss"},
18
+ {"name":"payload", "type": "STRING"}
19
+ ]' -F data=@/data/github-events-2015-01-01.1000.csv 'http://localhost:9000/imp?timestamp=created_at&name=events&partitionBy=DAY'
@@ -0,0 +1,43 @@
1
+ version: "2.2"
2
+
3
+ services:
4
+ cube:
5
+ container_name: birdbox-cube
6
+ image: ${BIRDBOX_CUBEJS_REGISTRY_PATH}cubejs/cube:${BIRDBOX_CUBEJS_VERSION:-latest}
7
+ environment:
8
+ CUBEJS_DB_TYPE: questdb
9
+ CUBEJS_DB_HOST: db
10
+ CUBEJS_DB_PORT: 8812
11
+ CUBEJS_DB_NAME: qdb
12
+ CUBEJS_DB_USER: admin
13
+ CUBEJS_DB_PASS: quest
14
+ CUBEJS_DEV_MODE: "true"
15
+ CUBEJS_WEB_SOCKETS: "true"
16
+ CUBEJS_API_SECRET: mysupersecret
17
+ depends_on:
18
+ - db
19
+ links:
20
+ - db
21
+ volumes:
22
+ - ./questdb/schema:/cube/conf/schema
23
+ - ./postgresql/dbt-project:/cube/conf/dbt-project
24
+ ports:
25
+ - "4000"
26
+ restart: always
27
+
28
+ db:
29
+ container_name: birdbox-db
30
+ image: questdb/questdb:6.2.1
31
+ ports:
32
+ - "8812"
33
+ - "9000"
34
+ - "9003"
35
+ restart: always
36
+ volumes:
37
+ - ./datasets:/data:ro
38
+ - ./questdb/scripts:/scripts:ro
39
+ healthcheck:
40
+ test: ["CMD-SHELL", "curl -f http://127.0.0.1:9003 || exit 1"]
41
+ interval: 10s
42
+ timeout: 5s
43
+ retries: 5
@@ -1,7 +1,7 @@
1
1
  export interface BirdBoxTestCaseOptions {
2
2
  name: string;
3
3
  loadScript?: string;
4
- envFile?: string;
4
+ env?: Record<string, string>;
5
5
  }
6
6
  export interface BirdBox {
7
7
  stop: () => Promise<void>;
@@ -18,8 +18,7 @@ export interface StartCliWithEnvOptions {
18
18
  useCubejsServerBinary?: boolean;
19
19
  loadScript?: string;
20
20
  cubejsConfig?: string;
21
- extraEnv?: Record<string, string>;
22
- envFile?: string;
21
+ env?: Record<string, string>;
23
22
  }
24
23
  export declare function startBirdBoxFromCli(options: StartCliWithEnvOptions): Promise<BirdBox>;
25
24
  //# sourceMappingURL=birdbox.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"birdbox.d.ts","sourceRoot":"","sources":["../../src/birdbox.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,aAAa,EAAE;QACb,aAAa,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9B,CAAC;CACH;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,CAiGjG;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,CA6H3F"}
1
+ {"version":3,"file":"birdbox.d.ts","sourceRoot":"","sources":["../../src/birdbox.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,aAAa,EAAE;QACb,aAAa,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9B,CAAC;CACH;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,CAgHjG;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,CAyH3F"}
@@ -10,10 +10,8 @@ const child_process_1 = require("child_process");
10
10
  const http_proxy_1 = __importDefault(require("http-proxy"));
11
11
  const testcontainers_1 = require("testcontainers");
12
12
  const shared_1 = require("@cubejs-backend/shared");
13
+ const testing_shared_1 = require("@cubejs-backend/testing-shared");
13
14
  const fs_extra_1 = __importDefault(require("fs-extra"));
14
- const dotenv_1 = __importDefault(require("@cubejs-backend/dotenv"));
15
- const postgres_1 = require("./db/postgres");
16
- const utils_1 = require("./utils");
17
15
  async function startBirdBoxFromContainer(options) {
18
16
  var _a;
19
17
  if (process.env.TEST_CUBE_HOST) {
@@ -30,19 +28,31 @@ async function startBirdBoxFromContainer(options) {
30
28
  },
31
29
  };
32
30
  }
31
+ if (process.env.BIRDBOX_CUBEJS_REGISTRY_PATH === undefined) {
32
+ process.env.BIRDBOX_CUBEJS_REGISTRY_PATH = 'localhost:5000/';
33
+ }
34
+ if (process.env.BIRDBOX_CUBEJS_VERSION === undefined) {
35
+ process.env.BIRDBOX_CUBEJS_VERSION = 'latest';
36
+ const tag = `${process.env.BIRDBOX_CUBEJS_REGISTRY_PATH}cubejs/cube:${process.env.BIRDBOX_CUBEJS_VERSION}`;
37
+ if (shared_1.execInDir('../..', `docker build . -f packages/cubejs-docker/dev.Dockerfile -t ${tag}`) !== 0) {
38
+ throw new Error('[Birdbox] Docker build failed.');
39
+ }
40
+ }
41
+ if (process.env.BIRDBOX_CUBESTORE_VERSION === undefined) {
42
+ process.env.BIRDBOX_CUBESTORE_VERSION = 'latest';
43
+ }
33
44
  const composeFile = `${options.name}.yml`;
34
45
  let dc = new testcontainers_1.DockerComposeEnvironment(path_1.default.resolve(path_1.default.dirname(__filename), '../../birdbox-fixtures/'), composeFile);
35
- if (options.envFile) {
36
- const env = dotenv_1.default.parse(fs_1.default.readFileSync(options.envFile));
37
- for (const k of Object.keys(env)) {
38
- dc = dc.withEnv(k, env[k]);
46
+ if (options.env) {
47
+ for (const k of Object.keys(options.env)) {
48
+ dc = dc.withEnv(k, options.env[k]);
39
49
  }
40
50
  }
41
51
  console.log(`[Birdbox] Using ${composeFile} compose file`);
42
52
  const env = await dc
43
53
  .withStartupTimeout(30 * 1000)
44
- .withEnv('BIRDBOX_CUBEJS_VERSION', process.env.BIRDBOX_CUBEJS_VERSION || 'latest')
45
- .withEnv('BIRDBOX_CUBESTORE_VERSION', process.env.BIRDBOX_CUBESTORE_VERSION || 'latest')
54
+ .withEnv('BIRDBOX_CUBEJS_VERSION', process.env.BIRDBOX_CUBEJS_VERSION)
55
+ .withEnv('BIRDBOX_CUBESTORE_VERSION', process.env.BIRDBOX_CUBESTORE_VERSION)
46
56
  .up();
47
57
  const host = '127.0.0.1';
48
58
  const port = env.getContainer('birdbox-cube').getMappedPort(4000);
@@ -86,7 +96,7 @@ async function startBirdBoxFromContainer(options) {
86
96
  apiUrl: `http://${host}:${port}/cubejs-api/v1`,
87
97
  wsUrl: `ws://${host}:${port}`,
88
98
  env: {
89
- ...(process.env.TEST_PLAYGROUND_PORT ? { CUBEJS_DB_HOST: utils_1.getLocalHostnameByOs() } : null),
99
+ ...(process.env.TEST_PLAYGROUND_PORT ? { CUBEJS_DB_HOST: testing_shared_1.getLocalHostnameByOs() } : null),
90
100
  },
91
101
  },
92
102
  };
@@ -95,7 +105,7 @@ exports.startBirdBoxFromContainer = startBirdBoxFromContainer;
95
105
  async function startBirdBoxFromCli(options) {
96
106
  let db;
97
107
  if (options.loadScript) {
98
- db = await postgres_1.PostgresDBRunner.startContainer({
108
+ db = await testing_shared_1.PostgresDBRunner.startContainer({
99
109
  volumes: [
100
110
  {
101
111
  source: path_1.default.join(__dirname, '..', '..', 'birdbox-fixtures', 'datasets'),
@@ -144,14 +154,10 @@ async function startBirdBoxFromCli(options) {
144
154
  CUBEJS_DB_TYPE: options.dbType === 'postgresql' ? 'postgres' : options.dbType,
145
155
  CUBEJS_DEV_MODE: 'true',
146
156
  CUBEJS_API_SECRET: 'mysupersecret',
147
- ...options.extraEnv
148
- ? options.extraEnv
149
- : {
150
- CUBEJS_WEB_SOCKETS: 'true',
151
- CUBEJS_PLAYGROUND_AUTH_SECRET: 'mysupersecret',
152
- },
153
- ...options.envFile
154
- ? dotenv_1.default.parse(fs_1.default.readFileSync(options.envFile))
157
+ CUBEJS_WEB_SOCKETS: 'true',
158
+ CUBEJS_PLAYGROUND_AUTH_SECRET: 'mysupersecret',
159
+ ...options.env
160
+ ? options.env
155
161
  : {
156
162
  CUBEJS_DB_HOST: db.getHost(),
157
163
  CUBEJS_DB_PORT: `${db.getMappedPort(5432)}`,
@@ -1 +1 @@
1
- {"version":3,"file":"birdbox.js","sourceRoot":"","sources":["../../src/birdbox.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"birdbox.js","sourceRoot":"","sources":["../../src/birdbox.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,2 @@
1
1
  export * from './birdbox';
2
- export * from './db';
3
2
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,MAAM,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC"}
package/dist/src/index.js CHANGED
@@ -11,5 +11,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  __exportStar(require("./birdbox"), exports);
14
- __exportStar(require("./db"), exports);
15
14
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,uCAAqB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@cubejs-backend/testing",
3
- "version": "0.29.30",
4
- "description": "Cube.js Testing Helpers",
3
+ "version": "0.29.35",
4
+ "description": "Cube.js e2e tests",
5
5
  "author": "Cube Dev, Inc.",
6
6
  "license": "Apache-2.0",
7
7
  "main": "dist/src/index.js",
@@ -26,14 +26,18 @@
26
26
  "birdbox:postgresql-pre-aggregations:snapshot": "jest --verbose --updateSnapshot -i dist/test/birdbox-postgresql-pre-aggregations.test.js",
27
27
  "birdbox:postgresql-cubestore": "jest --verbose -i dist/test/birdbox-postgresql-cubestore.test.js",
28
28
  "birdbox:postgresql-cubestore:snapshot": "jest --verbose --updateSnapshot -i dist/test/birdbox-postgresql-cubestore.test.js",
29
+ "birdbox:questdb": "jest --verbose -i dist/test/birdbox-questdb.test.js",
30
+ "birdbox:questdb:snapshot": "jest --verbose --updateSnapshot -i dist/test/birdbox-questdb.test.js",
29
31
  "birdbox:cli:postgresql": "jest --forceExit --verbose -i dist/test/cli-postgresql.test.js",
30
32
  "birdbox:cli:postgresql:snapshot": "jest --forceExit --verbose --updateSnapshot -i dist/test/cli-postgresql.test.js",
31
33
  "birdbox:local:postgresql": "USE_LOCAL_CUBEJS_BINARY=true jest --forceExit --verbose -i dist/test/cli-postgresql.test.js",
32
34
  "birdbox:local:postgresql:snapshot": "USE_LOCAL_CUBEJS_BINARY=true jest --forceExit --verbose --updateSnapshot -i dist/test/cli-postgresql.test.js",
33
35
  "birdbox:local:postgresql-pre-aggregations": "jest --forceExit --verbose -i dist/test/cli-postgresql-pre-aggregations.test.js",
34
36
  "birdbox:local:postgresql-pre-aggregations:snapshot": "jest --forceExit --verbose --updateSnapshot -i dist/test/cli-postgresql-pre-aggregations.test.js",
35
- "birdbox:driver": "jest --verbose -i dist/test/birdbox-driver.test.js",
36
- "birdbox:driver:snapshot": "jest --verbose --updateSnapshot -i dist/test/birdbox-driver.test.js",
37
+ "birdbox:athena": "jest --verbose -i dist/test/birdbox-athena.test.js",
38
+ "birdbox:athena:snapshot": "jest --verbose --updateSnapshot -i dist/test/birdbox-athena.test.js",
39
+ "birdbox:bigquery": "jest --verbose -i dist/test/birdbox-bigquery.test.js",
40
+ "birdbox:bigquery:snapshot": "jest --verbose --updateSnapshot -i dist/test/birdbox-bigquery.test.js",
37
41
  "cypress:install": "cypress install",
38
42
  "cypress:birdbox": "node dist/test/bin/cypress-birdbox.js"
39
43
  },
@@ -43,23 +47,25 @@
43
47
  ],
44
48
  "dependencies": {
45
49
  "@cubejs-backend/dotenv": "^9.0.2",
46
- "@cubejs-backend/query-orchestrator": "^0.29.29",
47
- "@cubejs-backend/schema-compiler": "^0.29.29",
48
- "@cubejs-backend/shared": "^0.29.29",
49
- "@cubejs-client/ws-transport": "^0.29.29",
50
- "@types/dedent": "^0.7.0",
50
+ "@cubejs-backend/query-orchestrator": "^0.29.35",
51
+ "@cubejs-backend/schema-compiler": "^0.29.35",
52
+ "@cubejs-backend/shared": "^0.29.33",
53
+ "@cubejs-backend/testing-shared": "^0.29.35",
54
+ "@cubejs-client/ws-transport": "^0.29.33",
51
55
  "dedent": "^0.7.0",
52
56
  "fs-extra": "^8.1.0",
53
57
  "http-proxy": "^1.18.1",
54
58
  "node-fetch": "^2.6.1",
59
+ "ramda": "^0.27.2",
55
60
  "testcontainers": "^7.5.0",
56
61
  "yargs": "^17.3.1"
57
62
  },
58
63
  "devDependencies": {
59
64
  "@4tw/cypress-drag-drop": "^1.6.0",
60
65
  "@cubejs-backend/linter": "^0.29.23",
61
- "@cubejs-client/core": "^0.29.29",
66
+ "@cubejs-client/core": "^0.29.33",
62
67
  "@jest/globals": "^26.6.2",
68
+ "@types/dedent": "^0.7.0",
63
69
  "@types/http-proxy": "^1.17.5",
64
70
  "@types/jest": "^26.0.22",
65
71
  "@types/node": "^10.17.55",
@@ -70,7 +76,6 @@
70
76
  "cypress-wait-until": "^1.7.1",
71
77
  "eslint-plugin-cypress": "^2.12.1",
72
78
  "jest": "^26.6.3",
73
- "jest-specific-snapshot": "^5.0.0",
74
79
  "jwt-decode": "^3.1.2",
75
80
  "typescript": "~4.1.5"
76
81
  },
@@ -90,5 +95,5 @@
90
95
  "eslintConfig": {
91
96
  "extends": "../cubejs-linter"
92
97
  },
93
- "gitHead": "a58544758bb174297378f66b663191e48033b9b5"
98
+ "gitHead": "15911bbb428a3a4dcc509edb84587f718b2ccdfd"
94
99
  }
@@ -1,9 +0,0 @@
1
- import { DbRunnerAbstract, DBRunnerContainerOptions } from './db-runner.abstract';
2
- declare type CubeStoreStartOptions = DBRunnerContainerOptions & {
3
- version?: string;
4
- };
5
- export declare class CubeStoreDBRunner extends DbRunnerAbstract {
6
- static startContainer(options: CubeStoreStartOptions): Promise<import("testcontainers").StartedTestContainer>;
7
- }
8
- export {};
9
- //# sourceMappingURL=cubestore.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"cubestore.d.ts","sourceRoot":"","sources":["../../../src/db/cubestore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAElF,aAAK,qBAAqB,GAAG,wBAAwB,GAAG;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,gBAAgB;WACvC,cAAc,CAAC,OAAO,EAAE,qBAAqB;CAgB5D"}
@@ -1,22 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.CubeStoreDBRunner = void 0;
4
- const testcontainers_1 = require("testcontainers");
5
- const db_runner_abstract_1 = require("./db-runner.abstract");
6
- class CubeStoreDBRunner extends db_runner_abstract_1.DbRunnerAbstract {
7
- static startContainer(options) {
8
- const version = process.env.TEST_CUBESTORE_VERSION || options.version || 'latest';
9
- const builder = new testcontainers_1.GenericContainer(`cubejs/cubestore:${version}`)
10
- .withStartupTimeout(10 * 1000)
11
- .withExposedPorts(3030);
12
- if (options.volumes) {
13
- // eslint-disable-next-line no-restricted-syntax
14
- for (const { source, target, bindMode } of options.volumes) {
15
- builder.withBindMount(source, target, bindMode);
16
- }
17
- }
18
- return builder.start();
19
- }
20
- }
21
- exports.CubeStoreDBRunner = CubeStoreDBRunner;
22
- //# sourceMappingURL=cubestore.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"cubestore.js","sourceRoot":"","sources":["../../../src/db/cubestore.ts"],"names":[],"mappings":";;;AAAA,mDAAkD;AAElD,6DAAkF;AAMlF,MAAa,iBAAkB,SAAQ,qCAAgB;IAC9C,MAAM,CAAC,cAAc,CAAC,OAA8B;QACzD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,OAAO,CAAC,OAAO,IAAI,QAAQ,CAAC;QAElF,MAAM,OAAO,GAAG,IAAI,iCAAgB,CAAC,oBAAoB,OAAO,EAAE,CAAC;aAChE,kBAAkB,CAAC,EAAE,GAAG,IAAI,CAAC;aAC7B,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAE1B,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,gDAAgD;YAChD,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE;gBAC1D,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;aACjD;SACF;QAED,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;CACF;AAjBD,8CAiBC"}
@@ -1,11 +0,0 @@
1
- export interface ContainerVolumeDefinition {
2
- source: string;
3
- target: string;
4
- bindMode?: 'rw' | 'ro';
5
- }
6
- export interface DBRunnerContainerOptions {
7
- volumes?: ContainerVolumeDefinition[];
8
- }
9
- export declare abstract class DbRunnerAbstract {
10
- }
11
- //# sourceMappingURL=db-runner.abstract.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"db-runner.abstract.d.ts","sourceRoot":"","sources":["../../../src/db/db-runner.abstract.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;CACvB;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,yBAAyB,EAAE,CAAA;CACtC;AAGD,8BAAsB,gBAAgB;CAErC"}
@@ -1,8 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.DbRunnerAbstract = void 0;
4
- // @todo Finish with old one PR for it
5
- class DbRunnerAbstract {
6
- }
7
- exports.DbRunnerAbstract = DbRunnerAbstract;
8
- //# sourceMappingURL=db-runner.abstract.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"db-runner.abstract.js","sourceRoot":"","sources":["../../../src/db/db-runner.abstract.ts"],"names":[],"mappings":";;;AAUA,sCAAsC;AACtC,MAAsB,gBAAgB;CAErC;AAFD,4CAEC"}
@@ -1,5 +0,0 @@
1
- export * from './mysql';
2
- export * from './postgres';
3
- export * from './cubestore';
4
- export * from './questdb';
5
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/db/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC"}