Skip to content

Commit

Permalink
Merge branch 'main' into payment-experience
Browse files Browse the repository at this point in the history
  • Loading branch information
PritishBudhiraja authored Sep 26, 2024
2 parents bc50633 + 7a27b83 commit 14d60c6
Show file tree
Hide file tree
Showing 29 changed files with 2,630 additions and 2,030 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/run-automation-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,7 @@ jobs:
uses: cypress-io/github-action@v6
with:
working-directory: ./cypress-tests
env:
CYPRESS_HYPERSWITCH_PUBLISHABLE_KEY: $HS_Pub_Key
CYPRESS_HYPERSWITCH_SECRET_KEY: $HS_Sec_Key
# Runs Cypress tests located in the specified directory
58 changes: 58 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,61 @@
# [0.90.0](https://github.com/juspay/hyperswitch-web/compare/v0.89.2...v0.90.0) (2024-09-26)


### Features

* customMessageForCardTerms prop added ([#705](https://github.com/juspay/hyperswitch-web/issues/705)) ([c30558f](https://github.com/juspay/hyperswitch-web/commit/c30558f8d772e54d7bf68aaff89d52dad89e73e9))

## [0.89.2](https://github.com/juspay/hyperswitch-web/compare/v0.89.1...v0.89.2) (2024-09-25)


### Bug Fixes

* styling issues ([#696](https://github.com/juspay/hyperswitch-web/issues/696)) ([764d526](https://github.com/juspay/hyperswitch-web/commit/764d526c69b7b9ec9b79b084fa0b6a50aab8e86a))

## [0.89.1](https://github.com/juspay/hyperswitch-web/compare/v0.89.0...v0.89.1) (2024-09-24)

# [0.89.0](https://github.com/juspay/hyperswitch-web/compare/v0.88.5...v0.89.0) (2024-09-24)


### Features

* added support to change create payment and added env to cypress ([#616](https://github.com/juspay/hyperswitch-web/issues/616)) ([2e27f98](https://github.com/juspay/hyperswitch-web/commit/2e27f98cf63e408627bd18c9184973ebc38438f5))

## [0.88.5](https://github.com/juspay/hyperswitch-web/compare/v0.88.4...v0.88.5) (2024-09-24)


### Bug Fixes

* dependant bot alerts ([#637](https://github.com/juspay/hyperswitch-web/issues/637)) ([dcc351d](https://github.com/juspay/hyperswitch-web/commit/dcc351db09f2416e5647360129f1253e2d8bb702))

## [0.88.4](https://github.com/juspay/hyperswitch-web/compare/v0.88.3...v0.88.4) (2024-09-23)


### Bug Fixes

* added support for redirectUrl for netcetera flow ([#636](https://github.com/juspay/hyperswitch-web/issues/636)) ([205054f](https://github.com/juspay/hyperswitch-web/commit/205054ff0dd1083c28c3ef5eb159e70440715efc))

## [0.88.3](https://github.com/juspay/hyperswitch-web/compare/v0.88.2...v0.88.3) (2024-09-20)


### Bug Fixes

* added suspense and error boundary for apple pay and google pay in tabs ([#632](https://github.com/juspay/hyperswitch-web/issues/632)) ([209f8e9](https://github.com/juspay/hyperswitch-web/commit/209f8e96be744c4c49e05c10700d839e3dd957f3))

## [0.88.2](https://github.com/juspay/hyperswitch-web/compare/v0.88.1...v0.88.2) (2024-09-20)


### Reverts

* chunk loading issue - 1 ([#623](https://github.com/juspay/hyperswitch-web/issues/623)) ([#631](https://github.com/juspay/hyperswitch-web/issues/631)) ([f719ff5](https://github.com/juspay/hyperswitch-web/commit/f719ff5472bd844125c97eae412c3afa1ec114ed))

## [0.88.1](https://github.com/juspay/hyperswitch-web/compare/v0.88.0...v0.88.1) (2024-09-20)


### Bug Fixes

* Invalid shipping address and taxjar api failing case handle in apple pay ([#628](https://github.com/juspay/hyperswitch-web/issues/628)) ([d4f3c41](https://github.com/juspay/hyperswitch-web/commit/d4f3c41ff3ccc1253f4c19613ead0be60cd98fc3))

# [0.88.0](https://github.com/juspay/hyperswitch-web/compare/v0.87.2...v0.88.0) (2024-09-17)


Expand Down
2 changes: 1 addition & 1 deletion Hyperswitch-React-Demo-App/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^14.4.2",
"body-parser": "^1.19.0",
"body-parser": "^1.20.3",
"dotenv": "^10.0.0",
"express": "^4.17.1",
"node-fetch": "2.7.0",
Expand Down
70 changes: 44 additions & 26 deletions Hyperswitch-React-Demo-App/src/Payment.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,44 @@ function Payment() {
const [hyperPromise, setHyperPromise] = useState(null);
const [clientSecret, setClientSecret] = useState("");

useEffect(() => {
const fetchData = async () => {
try {
const url = SELF_SERVER_URL === "" ? ENDPOINT : SELF_SERVER_URL;
const queryParams = new URLSearchParams(window.location.search);
const isCypressTestMode = queryParams.get("isCypressTestMode");
const publishableKeyQueryParam = queryParams.get("publishableKey");
const clientSecretQueryParam = queryParams.get("clientSecret");
const url = SELF_SERVER_URL === "" ? ENDPOINT : SELF_SERVER_URL;

const getPaymentData = async () => {
try {
const [configResponse, urlsResponse] = await Promise.all([
fetch(`${url}/config`),
fetch(`${url}/urls`),
]);

const paymentIntentResponse = isCypressTestMode
? { clientSecret: clientSecretQueryParam }
: await fetch(`${url}/create-payment-intent`).then((res) => res.json());

const [configResponse, urlsResponse, paymentIntentResponse] =
await Promise.all([
fetch(`${url}/config`),
fetch(`${url}/urls`),
fetch(`${url}/create-payment-intent`),
]);
if (!configResponse.ok || !urlsResponse.ok) {
throw new Error("Network response was not ok");
}

const paymentDataArray = await Promise.all([
configResponse.json(),
urlsResponse.json(),
]);

if (
!configResponse.ok ||
!urlsResponse.ok ||
!paymentIntentResponse.ok
) {
throw new Error("Network response was not ok");
}
return [...paymentDataArray, paymentIntentResponse];
} catch (error) {
console.error("Error fetching data:", error);
}
};

const [configData, urlsData, paymentIntentData] = await Promise.all([
configResponse.json(),
urlsResponse.json(),
paymentIntentResponse.json(),
]);
useEffect(() => {
const fetchData = async () => {
try {
const [configData, urlsData, paymentIntentData] = await getPaymentData(
url
);

const { publishableKey } = configData;
const { serverUrl, clientUrl } = urlsData;
Expand All @@ -45,9 +58,12 @@ function Payment() {
setHyperPromise(
new Promise((resolve) => {
resolve(
window.Hyper(publishableKey, {
customBackendUrl: serverUrl,
})
window.Hyper(
isCypressTestMode ? publishableKeyQueryParam : publishableKey,
{
customBackendUrl: serverUrl,
}
)
);
})
);
Expand Down Expand Up @@ -81,7 +97,9 @@ function Payment() {
<HyperElements
hyper={hyperPromise}
options={{
clientSecret,
clientSecret: isCypressTestMode
? clientSecretQueryParam
: clientSecret,
appearance: {
labels: "floating",
},
Expand Down
Empty file removed cypress-tests/.env
Empty file.
4 changes: 4 additions & 0 deletions cypress-tests/cypress.env.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"HYPERSWITCH_PUBLISHABLE_KEY": "",
"HYPERSWITCH_SECRET_KEY": ""
}
47 changes: 28 additions & 19 deletions cypress-tests/cypress/e2e/card-flow-e2e-test.cy.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
import * as testIds from "../../../src/Utilities/TestUtils.bs";
import { CLIENT_URL } from "../support/utils";
import { getClientURL } from "../support/utils";
import { createPaymentBody } from "../support/utils";
import { changeObjectKeyValue } from "../support/utils";

describe("Card payment flow test", () => {
let getIframeBody : () => Cypress.Chainable<JQuery<HTMLBodyElement>>;

const publishableKey = Cypress.env('HYPERSWITCH_PUBLISHABLE_KEY')
const secretKey = Cypress.env('HYPERSWITCH_SECRET_KEY')
let getIframeBody: () => Cypress.Chainable<JQuery<HTMLBodyElement>>;
let iframeSelector =
"#orca-payment-element-iframeRef-orca-elements-payment-element-payment-element";
"#orca-payment-element-iframeRef-orca-elements-payment-element-payment-element";

// changeObjectKeyValue(createPaymentBody,"profile_id","YOUR_PROFILE_ID")


beforeEach(() => {
getIframeBody = () => cy.iframe(iframeSelector);
cy.createPaymentIntent(secretKey, createPaymentBody).then(() => {
cy.getGlobalState("clientSecret").then((clientSecret) => {

cy.visit(CLIENT_URL);
});
cy.visit(getClientURL(clientSecret, publishableKey));
});

it("page loaded successfully", () => {
cy.visit(CLIENT_URL);
})
});


it("title rendered correctly", () => {
cy.contains("Hyperswitch Unified Checkout").should("be.visible");
});
Expand All @@ -30,18 +41,16 @@ describe("Card payment flow test", () => {

it('should check if cards are saved', () => {
// Visit the page where the test will be performed
cy.visit(CLIENT_URL);

getIframeBody().find(`[data-testid=${testIds.addNewCardIcon}]`)
.then($element => {
if ($element.length > 0) {
getIframeBody().find('[data-testid=cvvInput]').type('123');
getIframeBody().get("#submit").click();
cy.wait(2000);
cy.contains("Thanks for your order!").should("be.visible");
} else {
cy.log(' new card card flow');
}
});
.then($element => {
if ($element.length > 0) {
getIframeBody().find('[data-testid=cvvInput]').type('123');
getIframeBody().get("#submit").click();
cy.wait(2000);
cy.contains("Thanks for your order!").should("be.visible");
} else {
cy.log(' new card card flow');
}
});
});
});
36 changes: 9 additions & 27 deletions cypress-tests/cypress/support/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
import "cypress-iframe";
import { createPaymentBody } from "./utils"
import * as testIds from "../../../src/Utilities/TestUtils.bs";
// commands.js or your custom support file
const iframeSelector =
const iframeSelector =
"#orca-payment-element-iframeRef-orca-elements-payment-element-payment-element";

let globalState = {};
Expand Down Expand Up @@ -73,11 +74,11 @@ Cypress.Commands.add(
mapping[testIds.cardNoInputTestId] = customerData.threeDSCardNo;
}
let publishableKey = "pk_snd_3b33cd9404234113804aa1accaabe22f";
let clientSecret:string;
let clientSecret: string;
cy.request({
method: "GET",
url: "http://localhost:5252/create-payment-intent",
}).then((response: {body: { clientSecret: string }}) => {
}).then((response: { body: { clientSecret: string } }) => {
clientSecret = response.body.clientSecret;

cy.request({
Expand Down Expand Up @@ -145,37 +146,18 @@ Cypress.Commands.add(
}
);

const request = {
currency: "USD",
amount: 6500,
authentication_type: "three_ds",
description: "Joseph First Crypto",
email: "[email protected]",
connector_metadata: {
noon: {
order_category: "applepay",
},
},
metadata: {
udf1: "value1",
new_customer: "true",
login_date: "2019-09-10T10:11:12Z",
},
// customer_id: "hyperswitch_sdk_demo_test_id",
business_country: "US",
business_label: "default",
};
Cypress.Commands.add("createPaymentIntent", () => {

Cypress.Commands.add("createPaymentIntent", (secretKey: string, createPaymentBody: any) => {
return cy
.request({
method: "POST",
url: "https://sandbox.hyperswitch.io/payments",
headers: {
"Content-Type": "application/json",
Accept: "application/json",
"api-key": "snd_c691ade6995743bd88c166ba509ff5da",
"api-key": secretKey,
},
body: JSON.stringify(request),
body: JSON.stringify(createPaymentBody),
})
.then((response) => {
expect(response.headers["content-type"]).to.include("application/json");
Expand All @@ -188,6 +170,6 @@ Cypress.Commands.add("createPaymentIntent", () => {
});
});

Cypress.Commands.add("getGlobalState", (key: number) => {
Cypress.Commands.add("getGlobalState", (key: any) => {
return globalState[key];
});
6 changes: 3 additions & 3 deletions cypress-tests/cypress/support/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

export {}; // indicate that file is a module
export { }; // indicate that file is a module

export type CustomerData = {
cardNo: string
Expand All @@ -24,8 +24,8 @@ declare global {
testDynamicFields(
customerData: CustomerData, testIdsToRemoveArr: string[], isThreeDSEnabled: boolean
): Chainable<JQuery<HTMLElement>>
createPaymentIntent(): Chainable<Response<any>>
getGlobalState(key: number): Chainable<Response<any>>
createPaymentIntent(secretKey: string, createPaymentBody: Record<string, any>): Chainable<Response<any>>
getGlobalState(key: string): Chainable<Response<any>>
}
}
}
Loading

0 comments on commit 14d60c6

Please sign in to comment.