Fixed cypress dictionary for attribute checking

FDMediagroep · May 27, 2019 · 6e892be · 6e892be
1 parent 028135b
commit 6e892be
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/fd-cypress-recorder/content.js b/fd-cypress-recorder/content.js
diff --git a/fd-cypress-recorder/manifest.json b/fd-cypress-recorder/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Fd Cypress Recorder",
-  "version": "0.10",
+  "version": "0.11",
   "description": "Fd Cypress Recorder captures user interactions and generates Cypress test code.",
   "author": {
     "name": "Willem Liu",

diff --git a/fd-cypress-recorder/popup.js b/fd-cypress-recorder/popup.js
diff --git a/src/utils/CypressDictionary.ts b/src/utils/CypressDictionary.ts
@@ -153,9 +153,9 @@ export function getCode(event: AllFdEvents, options?: Options) {
         case FdEventType.VIEWPORT_SIZE:
             return `cy.viewport(${(event as FdViewportSizeEvent).width}, ${(event as FdViewportSizeEvent).height});`;
         case FdEventType.ATTRIBUTE_VALUE_EQUALS:
-            return `cy.get('${(event as FdAttributeValueEvent).target}').should('have.attr', '${(event as FdAttributeValueEvent).name}', '${(event as FdAttributeValueEvent).value.replace(new RegExp("'", 'g'), "\\\'")}');`;
+            return `cy.get('${(event as FdAttributeValueEvent).target}').then((el) => expect(el.attr('${(event as FdAttributeValueEvent).name}')).to.eq('${(event as FdAttributeValueEvent).value.replace(new RegExp("'", 'g'), "\\\'")}'));`;
         case FdEventType.ATTRIBUTE_VALUE_CONTAINS:
-            return `cy.get('${(event as FdAttributeValueEvent).target}').should('have.attr', '${(event as FdAttributeValueEvent).name}').then((attr) => expect(attr).to.contain('${(event as FdAttributeValueEvent).value.replace(new RegExp("'", 'g'), "\\\'")}'));`;
+            return `cy.get('${(event as FdAttributeValueEvent).target}').then((el) => expect(el.attr('${(event as FdAttributeValueEvent).name}')).to.contain('${(event as FdAttributeValueEvent).value.replace(new RegExp("'", 'g'), "\\\'")}'));`;
         case FdEventType.ATTRIBUTE_VALUE_EXISTS:
             return `cy.get('${(event as FdAttributeExistsEvent).target}').should('have.attr', '${(event as FdAttributeExistsEvent).name}');`;
         default: