From b63ec5b1ed84dc94927483b080f7adb3bf501701 Mon Sep 17 00:00:00 2001 From: ahon54 <55165000+ahon54@users.noreply.github.com> Date: Mon, 23 Mar 2020 21:06:39 -0700 Subject: [PATCH 1/4] changed test file --- add.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/add.test.js b/add.test.js index 14a6f06..709efe8 100644 --- a/add.test.js +++ b/add.test.js @@ -2,6 +2,6 @@ const {sum} = require('./add') describe("sum function", () => { test('Adding test', () => { - expect(sum(1, 1)).toBe(2); + expect(sum(1, 1)).toBe(3); }) }) From 8e0f36346be82a6cc04a1562768e84115aa1a72c Mon Sep 17 00:00:00 2001 From: ahon54 <55165000+ahon54@users.noreply.github.com> Date: Thu, 26 Mar 2020 21:00:01 -0700 Subject: [PATCH 2/4] test --- .github/workflows/mainEslint.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/mainEslint.yml b/.github/workflows/mainEslint.yml index c1a24bc..cb3e4e0 100644 --- a/.github/workflows/mainEslint.yml +++ b/.github/workflows/mainEslint.yml @@ -1,9 +1,21 @@ -workflow "Pull Request" { - on = "pull_request" - resolves = ["ESLint"] -} - -action "ESLint" { - uses = "hallee/eslint-action@master" - secrets = ["GITHUB_TOKEN"] -} +name: git action part 2 +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Use Node.js 12.x + # uses: actions/setup-node@v1 + with: + node-version: "12.x" + - name: npm install , and test + run: | + npm install + npm test + - name: ESLint Action + uses: hallee/eslint-action@1.0.1 \ No newline at end of file From f0f4c285e7b8001ac2c434be4d97f2f09119698b Mon Sep 17 00:00:00 2001 From: ahon54 <55165000+ahon54@users.noreply.github.com> Date: Thu, 26 Mar 2020 21:01:18 -0700 Subject: [PATCH 3/4] test --- .github/workflows/mainEslint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mainEslint.yml b/.github/workflows/mainEslint.yml index cb3e4e0..ec738ad 100644 --- a/.github/workflows/mainEslint.yml +++ b/.github/workflows/mainEslint.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Use Node.js 12.x - # uses: actions/setup-node@v1 + uses: actions/setup-node@v1 with: node-version: "12.x" - name: npm install , and test From 8182fb9d60b1b4d3fe43ce8922b1e6713821a835 Mon Sep 17 00:00:00 2001 From: ahon54 <55165000+ahon54@users.noreply.github.com> Date: Thu, 26 Mar 2020 21:03:40 -0700 Subject: [PATCH 4/4] test --- add.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/add.test.js b/add.test.js index 709efe8..14a6f06 100644 --- a/add.test.js +++ b/add.test.js @@ -2,6 +2,6 @@ const {sum} = require('./add') describe("sum function", () => { test('Adding test', () => { - expect(sum(1, 1)).toBe(3); + expect(sum(1, 1)).toBe(2); }) })