Merge branch 'develop'

cypress-tests/cypress/constants/selectors/common.js

@@ -13,7 +13,7 @@ export const commonSelectors = {
   autoSave: "[data-cy=autosave-indicator]",
   skipButton: ".driver-close-btn",
   skipInstallationModal: "[data-cy=skip-button]",
-  homePageLogo: "[data-cy=home-page-logo]:eq(1)",
+  homePageLogo: "[data-cy=home-page-logo]",
   emailField: "[data-cy=email-text-field]",
   passwordField: "[data-cy=password-text-field]",
   signInButton: "[data-cy=login-button]",
@@ -46,6 +46,8 @@ export const commonSelectors = {
   appCreatorName: "[data-cy=app-creator]",
   appCreatedTime: "[data-cy=app-creation-time]",
   homePageSearchBar: "[data-cy=home-page-search-bar]",
+  editorPageLogo: '[data-cy="editor-page-logo"]',
+  viewerPageLogo: '[data-cy="viewer-page-logo"]',
 
   folderListcard: (folderName) => {
     return `[data-cy="${cyParamName(folderName)}-list-card"]`;
@@ -113,6 +115,18 @@ export const commonWidgetSelector = {
   colourPickerInput: (index) => {
     return `[id*="rc-editable-input-"]:eq(${index})`;
   },
+  stylePicker: (paramName) => {
+    return `[data-cy="${cyParamName(paramName)}-picker"]`;
+  },
+  stylePickerValueIcon: (paramName) => {
+    return `[data-cy="${cyParamName(paramName)}-picker-icon"]`;
+  },
+  stylePickerValue: (paramName) => {
+    return `[data-cy="${cyParamName(paramName)}-value"]`;
+  },
+  stylePickerFxInput: (paramName) => {
+    return `[data-cy="${cyParamName(paramName)}-input-field"]`;
+  },
 
   buttonCloseEditorSideBar: "[data-rb-event-key='close-inpector-light']",
   buttonStylesEditorSideBar: "[data-rb-event-key='styles']",
@@ -123,8 +137,15 @@ export const commonWidgetSelector = {
 
   noEventHandlerMessage: "[data-cy='no-event-handler-message']",
   addEventHandlerLink: "[data-cy='add-event-handler']",
+  addMoreEventHandlerLink: '[data-cy="add-more-event-handler"]',
   eventHandlerCard: "[data-cy='event-handler-card']",
   alertMessageInputField: "[data-cy='alert-message-input-field']",
+  actionSelection: '[data-cy="action-selection"]',
+  eventComponentSelection:
+    '[data-cy="action-options-component-selection-field"]',
+  eventComponentActionSelection:
+    '[data-cy="action-options-action-selection-field"]',
+  componentTextInput: '[data-cy="action-options-text-input-field"]',
   changeLayoutButton: "[data-cy= 'change-layout-button']",
 
   sidebarinspector: "[data-cy='left-sidebar-inspector-button']",
@@ -135,4 +156,9 @@ export const commonWidgetSelector = {
   widgetDocumentationLink: "[data-cy='widget-documentation-link']",
 
   boxShadowDefaultParam: ["x", "y", "blur", "spread"],
+  colourPickerParent: "[data-cy='color-picker-parent']",
+  inputBoxShadow: "[data-cy= 'input-box-shadow']",
+  boxShadowColorPicker: "[data-cy='box-shadow-color-picker']",
+  textInputWidget: '[data-cy="draggable-widget-textinput1"]',
+  previewButton: `[data-cy="preview-link-button"]`,
 };

cypress-tests/cypress/constants/texts/button.js

@@ -1,47 +1,14 @@
-export const buttonText={
-  widgetName: "Button",
-  buttonProperties: "Properties",
-  buttonStyles: "Styles",
-  buttonName: "button1",
-  propertiesElements:{
-    propertiesAccordion: "Properties",
-    buttonTextLabel: "Button Text",
-    buttonTextInput: "Button",
-    loadingState: "Loading State",
-    eventsAccordion: "Events",
-    addEventListner: "+ Add event handler",
-    noEventHandler: "This button doesn't have any event handlers",
-    generalAccordion: "General",
-    layoutAccordion: "Layout",
-    showOnDesktopLabel: "Show on desktop",
-    showOnMobileLabel: "Show on mobile",
-    documentationLink: "Button documentation",
-  },
-  fxButton:"Fx",
-  savedToast: "Saved!",
-  invalidButtonName: "New Button",
-  buttonNameErrToast: "Invalid widget name. Should be unique and only include letters, numbers and underscore.",
-  validButtonName: "button",
-  buttonText:"Send",
-  trueText: "true",
-  falseText:"false",
-  eventLabel: "Event",
-  actionLabel: "Action",
-  actionOption: "Action options",
-  messageLabel: "Message",
-  alertTypeLabel: "Alert Type",
-  newMessage: " new toast",
-  newToast: "Hello world new toast",
-  stylesElements:{
-    backgroundColorLabel: "Background color",
-    textColorLabel: "Text color",
-    loaderColorLabel: "Loader color",
-    visibilityLabel: "Visibility",
-    disableLabel: "Disable",
-    borderRadiusLabel: "Border radius",
-  },
-  backgroundColorInput: "#375FCF",
-  textColorInput: "#fff",
-  loaderColorInput: "#fff",
-  borderRadiusInput: "15",
-};
+export const buttonText = {
+  defaultWidgetText: "Button",
+  defaultWidgetName: "button1",
+  buttonTextLabel: "Button Text",
+  loadingState: "Loading State",
+  buttonDocumentationLink: "Button documentation",
+  backgroundColor: "Background color",
+  textColor: "Text color",
+  loaderColor: "Loader color",
+  defaultBackgroundColor: "#375FCF",
+  defaultTextColor: "#fff",
+  defaultLoaderColor: "#fff",
+  borderRadiusInput: "20",
+};

cypress-tests/cypress/constants/texts/common.js

@@ -70,6 +70,8 @@ export const commonWidgetText = {
   parameterBoxShadow: "Box Shadow",
   boxShadowDefaultValue: "0px 0px 0px 0px #00000040",
   parameterOptionvalues: "Option values",
+  boxShadowColor: "Box Shadow Color",
+  boxShadowFxValue: "-5px 6px 5px 8px #ee121240",
 
   codeMirrorLabelTrue: "{{true}}",
   codeMirrorLabelFalse: "{{false}}",
@@ -83,6 +85,9 @@ export const commonWidgetText = {
   parameterLabel: "Label",
 
   datepickerDocumentationLink: "Datepicker documentation",
+  text1: "text1",
+  toggleswitch1: "toggleswitch1",
+  toggleSwitch: "Toggle Switch",
 };
 
 export const createBackspaceText = (text) => {