From 473e9a7564cd00b32d537251cba853ed51abce37 Mon Sep 17 00:00:00 2001 From: nikniv Date: Tue, 23 Aug 2022 14:21:42 +0530 Subject: [PATCH 1/9] test --- tests/cypress/integration/IKImage.spec.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/cypress/integration/IKImage.spec.js b/tests/cypress/integration/IKImage.spec.js index 79dfcb8..b992b42 100644 --- a/tests/cypress/integration/IKImage.spec.js +++ b/tests/cypress/integration/IKImage.spec.js @@ -18,6 +18,10 @@ describe('ImageKit React SDK', () => { cy.get('.lazyload') .should('have.attr', 'src') .and('include', 'tr:h-200,w-200/default-image.jpg'); + + cy.get('.lazyload') + .should('have.attr', 'src') + .and('include', 'random12345'); }); }); From eac8810b4c23b5e9fafb1956f66fe3cb2225fd69 Mon Sep 17 00:00:00 2001 From: nikniv Date: Tue, 23 Aug 2022 14:27:49 +0530 Subject: [PATCH 2/9] change npx script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e851ebc..bfaadd0 100755 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "test:cov": "jest --coverage", "test:e2e": "cypress open", "test:watch": "jest --watch", - "serve:test-app": "export SKIP_PREFLIGHT_CHECK=true;npx serve -s tests/test-app/build -p 4000" + "serve:test-app": "export SKIP_PREFLIGHT_CHECK=true;npm i -g serve;npm serve -s tests/test-app/build -p 4000" }, "repository": { "type": "git", From 100877166e165c877e9df0674d70477db6bd3a47 Mon Sep 17 00:00:00 2001 From: nikniv Date: Tue, 23 Aug 2022 14:33:04 +0530 Subject: [PATCH 3/9] change ci script --- .github/workflows/nodejs.yml | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 596a863..f29a36c 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -47,6 +47,7 @@ jobs: run: | npm install npm run build + npm i -g serve cd tests/test-app echo REACT_APP_URL_ENDPOINT = ${{ secrets.ik_url_endopint }} > .env; npm install diff --git a/package.json b/package.json index bfaadd0..5625c4c 100755 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "test:cov": "jest --coverage", "test:e2e": "cypress open", "test:watch": "jest --watch", - "serve:test-app": "export SKIP_PREFLIGHT_CHECK=true;npm i -g serve;npm serve -s tests/test-app/build -p 4000" + "serve:test-app": "export SKIP_PREFLIGHT_CHECK=true;npm serve -s tests/test-app/build -p 4000" }, "repository": { "type": "git", From 4dad37c7f714b3e00193063934bc70a56dd24d5c Mon Sep 17 00:00:00 2001 From: nikniv Date: Tue, 23 Aug 2022 14:38:03 +0530 Subject: [PATCH 4/9] change ci script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5625c4c..9619db4 100755 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "test:cov": "jest --coverage", "test:e2e": "cypress open", "test:watch": "jest --watch", - "serve:test-app": "export SKIP_PREFLIGHT_CHECK=true;npm serve -s tests/test-app/build -p 4000" + "serve:test-app": "export SKIP_PREFLIGHT_CHECK=true;npm run serve -s tests/test-app/build -p 4000" }, "repository": { "type": "git", From 4da777e185d40d3b86fe7aa5cb943db5c7972473 Mon Sep 17 00:00:00 2001 From: nikniv Date: Tue, 23 Aug 2022 14:45:38 +0530 Subject: [PATCH 5/9] change npm script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9619db4..3f1d1b2 100755 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "test:cov": "jest --coverage", "test:e2e": "cypress open", "test:watch": "jest --watch", - "serve:test-app": "export SKIP_PREFLIGHT_CHECK=true;npm run serve -s tests/test-app/build -p 4000" + "serve:test-app": "export SKIP_PREFLIGHT_CHECK=true;serve -s tests/test-app/build -p 4000" }, "repository": { "type": "git", From e6e7512a63d50bc5cd140c1a17d50f79297f2224 Mon Sep 17 00:00:00 2001 From: nikniv Date: Tue, 23 Aug 2022 14:51:38 +0530 Subject: [PATCH 6/9] fix serve version @ 13.0.2 --- .github/workflows/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index f29a36c..edb2ac5 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -47,7 +47,7 @@ jobs: run: | npm install npm run build - npm i -g serve + npm i -g serve@13.0.2 cd tests/test-app echo REACT_APP_URL_ENDPOINT = ${{ secrets.ik_url_endopint }} > .env; npm install From 19f597ef853306fa71bd21a14a9878331a4e2fe9 Mon Sep 17 00:00:00 2001 From: nikniv Date: Tue, 23 Aug 2022 16:11:18 +0530 Subject: [PATCH 7/9] cypress spec --- tests/cypress/integration/IKImage.spec.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/cypress/integration/IKImage.spec.js b/tests/cypress/integration/IKImage.spec.js index b992b42..f05c59d 100644 --- a/tests/cypress/integration/IKImage.spec.js +++ b/tests/cypress/integration/IKImage.spec.js @@ -19,9 +19,15 @@ describe('ImageKit React SDK', () => { .should('have.attr', 'src') .and('include', 'tr:h-200,w-200/default-image.jpg'); + let srcString; cy.get('.lazyload') - .should('have.attr', 'src') - .and('include', 'random12345'); + .should(($img) => { + srcString = $img.attr('src'); + console.log('~~~~~~~~~~~~~~~~~~~') + console.log(srcString.substr(22)) + console.log(Buffer.from(srcString).toString('base64')) + console.log('~~~~~~~~~~~~~~~~~~~') + }); }); }); From d478dcf87b3c25392159d8c33177b91feb5d6235 Mon Sep 17 00:00:00 2001 From: nikniv Date: Tue, 23 Aug 2022 16:25:25 +0530 Subject: [PATCH 8/9] cypress spec --- tests/cypress/integration/IKImage.spec.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/cypress/integration/IKImage.spec.js b/tests/cypress/integration/IKImage.spec.js index f05c59d..1f4f26a 100644 --- a/tests/cypress/integration/IKImage.spec.js +++ b/tests/cypress/integration/IKImage.spec.js @@ -20,14 +20,21 @@ describe('ImageKit React SDK', () => { .and('include', 'tr:h-200,w-200/default-image.jpg'); let srcString; + let srcB64; cy.get('.lazyload') .should(($img) => { srcString = $img.attr('src'); + srcB64 = Buffer.from(srcString).toString('base64') + console.log('~~~~~~~~~~~~~~~~~~~') console.log(srcString.substr(22)) console.log(Buffer.from(srcString).toString('base64')) console.log('~~~~~~~~~~~~~~~~~~~') }); + + cy.get('.lazyload') + .should('have.attr', 'src') + .and('include', srcB64 + ' ' + srcString); }); }); From 3c1872cd15a66284e2a5f0e2f1dbbbf65bbbefe4 Mon Sep 17 00:00:00 2001 From: nikniv Date: Tue, 23 Aug 2022 17:16:44 +0530 Subject: [PATCH 9/9] cypress spec --- package.json | 2 +- tests/cypress/integration/IKImage.spec.js | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 3f1d1b2..876f6c4 100755 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "test:cov": "jest --coverage", "test:e2e": "cypress open", "test:watch": "jest --watch", - "serve:test-app": "export SKIP_PREFLIGHT_CHECK=true;serve -s tests/test-app/build -p 4000" + "serve:test-app": "export SKIP_PREFLIGHT_CHECK=true;export ELECTRON_ENABLE_LOGGING=1;serve -s tests/test-app/build -p 4000" }, "repository": { "type": "git", diff --git a/tests/cypress/integration/IKImage.spec.js b/tests/cypress/integration/IKImage.spec.js index 1f4f26a..c63bffc 100644 --- a/tests/cypress/integration/IKImage.spec.js +++ b/tests/cypress/integration/IKImage.spec.js @@ -22,19 +22,21 @@ describe('ImageKit React SDK', () => { let srcString; let srcB64; cy.get('.lazyload') - .should(($img) => { + .then(($img) => { srcString = $img.attr('src'); srcB64 = Buffer.from(srcString).toString('base64') console.log('~~~~~~~~~~~~~~~~~~~') console.log(srcString.substr(22)) console.log(Buffer.from(srcString).toString('base64')) + // cy.task('log', 'This will be output to the terminal') + // cy.task('log', srcB64 + ' ' + srcString) console.log('~~~~~~~~~~~~~~~~~~~') - }); - cy.get('.lazyload') - .should('have.attr', 'src') - .and('include', srcB64 + ' ' + srcString); + cy.get('.lazyload') + .should('have.attr', 'src') + .and('include', srcString.substr(22) + " " + srcB64); + }); }); });