From 592a3860660420cf49a3a5ed6470f3c101695c31 Mon Sep 17 00:00:00 2001 From: MihailHadzhiev2022 Date: Wed, 18 May 2022 14:09:58 +0300 Subject: [PATCH 1/3] adding interact locators for AddMultiOptionDataType test --- .../integration/addMultiOptionDatatype.spec.js | 17 +++++++++-------- packages/builder/cypress/support/interact.js | 10 +++++++++- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js index e67f1eb2a2..3e0ba92ba4 100644 --- a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js +++ b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js @@ -1,4 +1,5 @@ import filterTests from "../support/filterTests" +const interact = require('../support/interact') filterTests(['all'], () => { context("Add Multi-Option Datatype", () => { @@ -17,19 +18,19 @@ filterTests(['all'], () => { cy.navigateToFrontend() cy.wait(500) // Add data provider - cy.get(`[data-cy="category-Data"]`).click() - cy.get(`[data-cy="component-Data Provider"]`).click() - cy.get('[data-cy="dataSource-prop-control"]').click() - cy.get(".dropdown").contains("Multi Data").click() + cy.get(interact.CATEGORY_DATA).click() + cy.get(interact.COMPONENT_DATA_PROVIDER).click() + cy.get(interact.DATASOURCE_PROP_CONTROL).click() + cy.get(interact.DROPDOWN).contains("Multi Data").click() cy.wait(500) // Add Form with schema to match table cy.addComponent("Form", "Form") - cy.get('[data-cy="dataSource-prop-control"').click() - cy.get(".dropdown").contains("Multi Data").click() + cy.get(interact.DATASOURCE_PROP_CONTROL).click() + cy.get(interact.DROPDOWN).contains("Multi Data").click() cy.wait(500) // Add multi-select picker to form cy.addComponent("Form", "Multi-select Picker").then(componentId => { - cy.get('[data-cy="field-prop-control"]').type("Test Data").type("{enter}") + cy.get(interact.DATASOURCE_FIELD_CONTROL).type("Test Data").type("{enter}") cy.wait(1000) cy.getComponent(componentId).contains("Choose some options").click() // Check picker has 5 items @@ -40,7 +41,7 @@ filterTests(['all'], () => { } // Check items have been selected cy.getComponent(componentId) - .find(".spectrum-Picker-label") + .find(interact.SPECTRUM_Picker_LABEL) .contains("(5)") }) }) diff --git a/packages/builder/cypress/support/interact.js b/packages/builder/cypress/support/interact.js index 46954227de..cff16325da 100644 --- a/packages/builder/cypress/support/interact.js +++ b/packages/builder/cypress/support/interact.js @@ -8,6 +8,14 @@ export const TEMPLATE_CATEGORY_ACTIONGROUP = ".template-category" export const TEMPLATE_CATEGORY_FILTER_ACTIONBUTTON = ".template-category-filters .spectrum-ActionButton" export const SPECTRUM_MODAL = ".spectrum-Modal" -export const APP_NAME_INPUT = "input" // we need to update this with atribute cy-data +export const APP_NAME_INPUT = "input" // we need to update this with atribute cy-data; export const SPECTRUM_BUTTON_GROUP = ".spectrum-ButtonGroup" export const SPECTRUM_MODAL_INPUT = ".spectrum-Modal input" + +//AddMultiOptionDatatype test +export const CATEGORY_DATA = '[data-cy="category-Data"]' +export const COMPONENT_DATA_PROVIDER = '[data-cy="component-Data Provider"]' +export const DATASOURCE_PROP_CONTROL = '[data-cy="dataSource-prop-control"]' +export const DROPDOWN = ".dropdown" +export const SPECTRUM_Picker_LABEL = ".spectrum-Picker-label" +export const DATASOURCE_FIELD_CONTROL = '[data-cy="field-prop-control"]' From dc0c5a6f5c6fd37dbc688abe199dcf625ef63cb0 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 18 May 2022 12:19:42 +0000 Subject: [PATCH 2/3] v1.0.164-alpha.4 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 0071cf1031..c67eeb9bed 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.164-alpha.3", + "version": "1.0.164-alpha.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 94715e43b0..951c11d55a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.164-alpha.3", + "version": "1.0.164-alpha.4", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 9b067e3b14..9e4f499108 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.164-alpha.3", + "version": "1.0.164-alpha.4", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.164-alpha.3", + "@budibase/string-templates": "^1.0.164-alpha.4", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index a112102180..57f5b7124f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.164-alpha.3", + "version": "1.0.164-alpha.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.164-alpha.3", - "@budibase/client": "^1.0.164-alpha.3", - "@budibase/frontend-core": "^1.0.164-alpha.3", - "@budibase/string-templates": "^1.0.164-alpha.3", + "@budibase/bbui": "^1.0.164-alpha.4", + "@budibase/client": "^1.0.164-alpha.4", + "@budibase/frontend-core": "^1.0.164-alpha.4", + "@budibase/string-templates": "^1.0.164-alpha.4", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index b22023b113..c6904a5c57 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.164-alpha.3", + "version": "1.0.164-alpha.4", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 51ba54566c..99237f87d3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.164-alpha.3", + "version": "1.0.164-alpha.4", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.164-alpha.3", - "@budibase/frontend-core": "^1.0.164-alpha.3", - "@budibase/string-templates": "^1.0.164-alpha.3", + "@budibase/bbui": "^1.0.164-alpha.4", + "@budibase/frontend-core": "^1.0.164-alpha.4", + "@budibase/string-templates": "^1.0.164-alpha.4", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 75075b6aaf..88eb0b5cbd 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.164-alpha.3", + "version": "1.0.164-alpha.4", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.164-alpha.3", + "@budibase/bbui": "^1.0.164-alpha.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 7934b10b04..d4edcc82b0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.164-alpha.3", + "version": "1.0.164-alpha.4", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -69,10 +69,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.164-alpha.3", - "@budibase/client": "^1.0.164-alpha.3", + "@budibase/backend-core": "^1.0.164-alpha.4", + "@budibase/client": "^1.0.164-alpha.4", "@budibase/pro": "1.0.164-alpha.3", - "@budibase/string-templates": "^1.0.164-alpha.3", + "@budibase/string-templates": "^1.0.164-alpha.4", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index bfcf491c06..8c05198e17 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.164-alpha.3", + "version": "1.0.164-alpha.4", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 82a9e53d85..10f5ff35da 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.164-alpha.3", + "version": "1.0.164-alpha.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.164-alpha.3", + "@budibase/backend-core": "^1.0.164-alpha.4", "@budibase/pro": "1.0.164-alpha.3", - "@budibase/string-templates": "^1.0.164-alpha.3", + "@budibase/string-templates": "^1.0.164-alpha.4", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 82acb63cfa61047ebc0577d4f168ae965514538d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 18 May 2022 12:21:09 +0000 Subject: [PATCH 3/3] Update pro version to 1.0.164-alpha.4 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index d4edcc82b0..8648f983e0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -71,7 +71,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.164-alpha.4", "@budibase/client": "^1.0.164-alpha.4", - "@budibase/pro": "1.0.164-alpha.3", + "@budibase/pro": "1.0.164-alpha.4", "@budibase/string-templates": "^1.0.164-alpha.4", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 10f5ff35da..f44d9073c9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.164-alpha.4", - "@budibase/pro": "1.0.164-alpha.3", + "@budibase/pro": "1.0.164-alpha.4", "@budibase/string-templates": "^1.0.164-alpha.4", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7",