diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template new file mode 100644 index 000000000..bb13dfc45 --- /dev/null +++ b/.github/workflows/test.yml-template @@ -0,0 +1,23 @@ +name: Test + +on: + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [20.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm install + - run: npm test diff --git a/package-lock.json b/package-lock.json index 5794158b4..77e8d3a6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "GPL-3.0", "devDependencies": { "@mate-academy/eslint-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^1.9.12", "eslint": "^8.57.0", "eslint-plugin-jest": "^28.6.0", "eslint-plugin-node": "^11.1.0", @@ -1467,10 +1467,11 @@ } }, "node_modules/@mate-academy/scripts": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.6.tgz", - "integrity": "sha512-b4om/whj4G9emyi84ORE3FRZzCRwRIesr8tJHXa8EvJdOaAPDpzcJ8A0sFfMsWH9NUOVmOwkBtOXDu5eZZ00Ig==", + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.9.12.tgz", + "integrity": "sha512-/OcmxMa34lYLFlGx7Ig926W1U1qjrnXbjFJ2TzUcDaLmED+A5se652NcWwGOidXRuMAOYLPU2jNYBEkKyXrFJA==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 73477abb9..04c53d063 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "license": "GPL-3.0", "devDependencies": { "@mate-academy/eslint-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^1.9.12", "eslint": "^8.57.0", "eslint-plugin-jest": "^28.6.0", "eslint-plugin-node": "^11.1.0", diff --git a/src/calculateRentalCost.js b/src/calculateRentalCost.js index 1e3a27d11..1760911f9 100644 --- a/src/calculateRentalCost.js +++ b/src/calculateRentalCost.js @@ -3,8 +3,23 @@ * * @return {number} */ + +const LONG_TERM = 7; +const LONG_TERM_DISCOUNT = 50; +const SHORT_TERM = 3; +const SHORT_TERM_DISCOUNT = 20; +const RENT = 40; + function calculateRentalCost(days) { - // write code here + if (days >= LONG_TERM) { + return RENT * days - LONG_TERM_DISCOUNT; + } + + if (days >= SHORT_TERM) { + return RENT * days - SHORT_TERM_DISCOUNT; + } + + return RENT * days; } module.exports = calculateRentalCost; diff --git a/src/calculateRentalCost.test.js b/src/calculateRentalCost.test.js index 7ab8b8587..7b77d929f 100644 --- a/src/calculateRentalCost.test.js +++ b/src/calculateRentalCost.test.js @@ -3,21 +3,17 @@ const calculateRentalCost = require('./calculateRentalCost'); test(`Do not add any discount for less than 3 days`, () => { - expect(calculateRentalCost(2)) - .toBe(80); + expect(calculateRentalCost(2)).toBe(80); }); test('Should add the basic discount from 3 to 6 days of rent', () => { - expect(calculateRentalCost(3)) - .toBe(100); + expect(calculateRentalCost(3)).toBe(100); }); test('Should add the basic discount from 3 to 6 days of rent', () => { - expect(calculateRentalCost(6)) - .toBe(220); + expect(calculateRentalCost(6)).toBe(220); }); test('Should add an additional discount for 7 and more days of rent', () => { - expect(calculateRentalCost(7)) - .toBe(230); + expect(calculateRentalCost(7)).toBe(230); });