From a35e37a069701d32010b66b6c1a902f72a721318 Mon Sep 17 00:00:00 2001 From: ankitdas13 Date: Wed, 22 Feb 2023 19:30:25 +0530 Subject: [PATCH 1/6] version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad7d6625..216e9ae9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "razorpay", - "version": "2.8.5", + "version": "2.8.6", "description": "Official Node SDK for Razorpay API", "main": "dist/razorpay", "typings": "dist/razorpay", From dafd88f263e2f167cc3244835c250d534de738ca Mon Sep 17 00:00:00 2001 From: ankitdas13 Date: Wed, 12 Jul 2023 15:18:47 +0530 Subject: [PATCH 2/6] e2e test transfer & smartcollect --- .github/workflows/prod_ci.yml | 32 +++++++++ test_prod/razorpay.js | 8 +++ test_prod/resources/transfers.spec.js | 42 ++++++++++++ test_prod/resources/virtualAccounts.spec.js | 76 +++++++++++++++++++++ 4 files changed, 158 insertions(+) create mode 100644 .github/workflows/prod_ci.yml create mode 100644 test_prod/razorpay.js create mode 100644 test_prod/resources/transfers.spec.js create mode 100644 test_prod/resources/virtualAccounts.spec.js diff --git a/.github/workflows/prod_ci.yml b/.github/workflows/prod_ci.yml new file mode 100644 index 00000000..02101784 --- /dev/null +++ b/.github/workflows/prod_ci.yml @@ -0,0 +1,32 @@ +name: e2e prod test +on: + push: + branches: + - master + tags: + - v[0-9]+.[0-9]+.[0-9]+* + pull_request: + branches: + - master +jobs: + test: + name: Run tests and publish test coverage + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [18.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + cache: 'npm' + - name: Install dependencies + run: npm install + - name: Run tests + run: npm run test_prod + env: + API_KEY: ${{ secrets.API_KEY }} + API_SECRET: ${{ secrets.API_SECRET }} \ No newline at end of file diff --git a/test_prod/razorpay.js b/test_prod/razorpay.js new file mode 100644 index 00000000..52739e22 --- /dev/null +++ b/test_prod/razorpay.js @@ -0,0 +1,8 @@ +'use strict'; + +const Razorpay = require("../dist/razorpay"); + +module.exports = new Razorpay({ + key_id: process.env.API_KEY || "", + key_secret: process.env.API_SECRET || "" +}); diff --git a/test_prod/resources/transfers.spec.js b/test_prod/resources/transfers.spec.js new file mode 100644 index 00000000..d07d5f0c --- /dev/null +++ b/test_prod/resources/transfers.spec.js @@ -0,0 +1,42 @@ +'use strict' + +var assert = require('assert'); +const rzpInstance = require('../razorpay') + +let customerId = null; +let transferId = null; + +describe('TRANSFERS', () => { + + it('fetch all transfers', (done) => { + + rzpInstance.transfers.all() + .then((response) => { + if(response.items.length > 0){ + if('id' in response.items[0]){ + transferId = response.items[0].id + } + } + assert.ok(response.hasOwnProperty('count')) + assert.ok(response.hasOwnProperty('items')) + done() + }).catch(err => console.log(err)) + }) + + it('fetch transfer', (done) => { + rzpInstance.transfers.fetch(transferId).then((response) => { + assert.ok(response.hasOwnProperty('id')) + assert.ok(response.hasOwnProperty('entity')) + assert.ok((response.id == transferId)) + done() + }).catch(err => console.log(err)) + }) + + it('fetch settlement details', (done) => { + rzpInstance.transfers.fetchSettlements().then((response) => { + assert.ok(response.hasOwnProperty('count')) + assert.ok(response.hasOwnProperty('items')) + done() + }).catch(err => console.log(err)) + }) +}) diff --git a/test_prod/resources/virtualAccounts.spec.js b/test_prod/resources/virtualAccounts.spec.js new file mode 100644 index 00000000..932aa42c --- /dev/null +++ b/test_prod/resources/virtualAccounts.spec.js @@ -0,0 +1,76 @@ +'use strict' + +var assert = require('assert'); +const rzpInstance = require('../razorpay') + +let customerId = null; +let virtualId = null; + +describe('VIRTUAL ACCOUNTS', () => { + + it('create virtual account', (done) => { + + rzpInstance.customers.create({ + "name": "Gaurav Kumar", + "contact": 9123456780, + "email": "gaurav.kumar@example.com", + "fail_existing": 0, + "notes": { + "notes_key_1": "Tea, Earl Grey, Hot", + "notes_key_2": "Tea, Earl Grey… decaf." + } + }).then(response=>{ + customerId = response.id + return customerId + }).then((id)=>{ + rzpInstance.virtualAccounts.create({ + "receivers": { + "types": [ + "bank_account" + ] + }, + "description": "Virtual Account created for Raftar Soft", + "customer_id": id, + "notes": { + "project_name": "Banking Software" + } + }).then((response) => { + virtualId = response.id + assert.ok(response.hasOwnProperty('id')) + assert.ok(response.hasOwnProperty('entity')) + done() + }).catch(err => console.log(err)) + }).catch(err => console.log(err)) + }) + + it('fetch virtualAccount', (done) => { + rzpInstance.virtualAccounts.fetch(virtualId).then((response) => { + assert.ok(response.hasOwnProperty('id')) + done() + }).catch(err => console.log(err)) + }) + + it('fetch payments of virtualAccount', (done) => { + rzpInstance.virtualAccounts.fetchPayments(virtualId).then((response) => { + assert.ok(response.hasOwnProperty('count')) + assert.ok(response.hasOwnProperty('items')) + done() + }).catch(err => console.log(err)) + }) + + it('fetch all virtualAccounts', (done) => { + rzpInstance.virtualAccounts.all().then((response) => { + assert.ok(response.hasOwnProperty('count')) + assert.ok(response.hasOwnProperty('items')) + done() + }).catch(err => console.log(err)) + }) + + it('close virtualAccounts', (done) => { + rzpInstance.virtualAccounts.close(virtualId).then((response) => { + assert.ok(response.hasOwnProperty('id')) + assert.ok(response.hasOwnProperty('entity')) + done() + }).catch(err => console.log(err)) + }) +}) From 65d39a48f0727895c30eb67ecd1ded1db3630dd7 Mon Sep 17 00:00:00 2001 From: ankitdas13 Date: Wed, 12 Jul 2023 15:20:51 +0530 Subject: [PATCH 3/6] update package.json scripts --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 03390d0a..642f7f1e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "build": "npm run clean && npm run build:commonjs && npm run cp-ts", "debug": "npm run build && node-debug examples/index.js", "test": "npm run build && mocha --recursive --require babel-register test/ && nyc --reporter=text mocha", - "coverage": "nyc report --reporter=text-lcov > coverage.lcov" + "coverage": "nyc report --reporter=text-lcov > coverage.lcov", + "test_prod": "npm run build && mocha --timeout 10000 --recursive --require babel-register test_prod/" }, "repository": { "type": "git", From a3badfeb71045bd46889ffb0b84f9a3574dbbd13 Mon Sep 17 00:00:00 2001 From: Ankit Das <89454448+ankitdas13@users.noreply.github.com> Date: Tue, 1 Aug 2023 16:43:38 +0530 Subject: [PATCH 4/6] Update prod_ci.yml --- .github/workflows/prod_ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prod_ci.yml b/.github/workflows/prod_ci.yml index 02101784..ec3f8e92 100644 --- a/.github/workflows/prod_ci.yml +++ b/.github/workflows/prod_ci.yml @@ -26,7 +26,7 @@ jobs: - name: Install dependencies run: npm install - name: Run tests - run: npm run test_prod + run: npm run env -- mocha --timeout 10000 --recursive --require babel-register test_prod/ env: API_KEY: ${{ secrets.API_KEY }} - API_SECRET: ${{ secrets.API_SECRET }} \ No newline at end of file + API_SECRET: ${{ secrets.API_SECRET }} From e6ef49a2e35d0eb3fe566965000864d1fbc06f23 Mon Sep 17 00:00:00 2001 From: Ankit Das <89454448+ankitdas13@users.noreply.github.com> Date: Tue, 1 Aug 2023 16:44:05 +0530 Subject: [PATCH 5/6] revert changes --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 642f7f1e..03390d0a 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,7 @@ "build": "npm run clean && npm run build:commonjs && npm run cp-ts", "debug": "npm run build && node-debug examples/index.js", "test": "npm run build && mocha --recursive --require babel-register test/ && nyc --reporter=text mocha", - "coverage": "nyc report --reporter=text-lcov > coverage.lcov", - "test_prod": "npm run build && mocha --timeout 10000 --recursive --require babel-register test_prod/" + "coverage": "nyc report --reporter=text-lcov > coverage.lcov" }, "repository": { "type": "git", From 051f2fab2d4440a01fd619f4423a39657fbc88e5 Mon Sep 17 00:00:00 2001 From: Ankit Das <89454448+ankitdas13@users.noreply.github.com> Date: Tue, 1 Aug 2023 16:44:29 +0530 Subject: [PATCH 6/6] Update razorpay.js --- test_prod/razorpay.js | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/test_prod/razorpay.js b/test_prod/razorpay.js index 52739e22..5c2c49c4 100644 --- a/test_prod/razorpay.js +++ b/test_prod/razorpay.js @@ -1,8 +1,25 @@ 'use strict'; const Razorpay = require("../dist/razorpay"); +let request = require('request-promise'); -module.exports = new Razorpay({ +class RazorpayBeta extends Razorpay { + constructor(options) { + super(options) + this.api.rq = request.defaults({ + baseUrl: options.hostUrl, + json: true, + auth: { + user: options.key_id, + pass: options.key_secret + } + }) + } +} + + +module.exports = new RazorpayBeta({ key_id: process.env.API_KEY || "", - key_secret: process.env.API_SECRET || "" + key_secret: process.env.API_SECRET || "", + hostUrl : "https://api-web.dev.razorpay.in" });