Skip to content

Commit 5fa5950

Browse files
authored
Adds dependabot auto-merge configuration (#295)
1 parent 462a46f commit 5fa5950

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

.github/workflows/auto-merge.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: auto-merge
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
auto-merge:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- uses: ahmadnassri/action-dependabot-auto-merge@v2
12+
with:
13+
target: minor
14+
github-token: ${{ secrets.AUTO_MERGE }}

__tests__/acceptance/eslint-with-todo-formatter-test.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,10 @@ describe('eslint with todo formatter', function () {
507507

508508
// generate todo based on existing error
509509
await runEslintWithFormatter({
510-
env: { UPDATE_TODO: '1' },
510+
env: {
511+
UPDATE_TODO: '1',
512+
TODO_CREATED_DATE: new Date('12/01/21').toJSON(),
513+
},
511514
});
512515

513516
// mimic fixing the error manually via user interaction
@@ -526,8 +529,8 @@ describe('eslint with todo formatter', function () {
526529
expect(readTodoStorageFile(getTodoStorageFilePath(project.baseDir)))
527530
.toMatchInlineSnapshot(`
528531
Array [
529-
"add|eslint|no-unused-vars|1|10|1|16|50f2c7b9dac0a4af1cde42fe5be7963201d0504d|1639526400000|1642118400000|1644710400000|src/with-fixable-error.js",
530-
"remove|eslint|no-unused-vars|1|10|1|16|50f2c7b9dac0a4af1cde42fe5be7963201d0504d|1639526400000|1642118400000|1644710400000|src/with-fixable-error.js",
532+
"add|eslint|no-unused-vars|1|10|1|16|50f2c7b9dac0a4af1cde42fe5be7963201d0504d|1638316800000|1640908800000|1643500800000|src/with-fixable-error.js",
533+
"remove|eslint|no-unused-vars|1|10|1|16|50f2c7b9dac0a4af1cde42fe5be7963201d0504d|1638316800000|1640908800000|1643500800000|src/with-fixable-error.js",
531534
]
532535
`);
533536

@@ -540,7 +543,7 @@ describe('eslint with todo formatter', function () {
540543
expect(readTodoStorageFile(getTodoStorageFilePath(project.baseDir)))
541544
.toMatchInlineSnapshot(`
542545
Array [
543-
"add|eslint|no-unused-vars|1|10|1|16|50f2c7b9dac0a4af1cde42fe5be7963201d0504d|1639526400000|1642118400000|1644710400000|src/with-fixable-error.js",
546+
"add|eslint|no-unused-vars|1|10|1|16|50f2c7b9dac0a4af1cde42fe5be7963201d0504d|1638316800000|1640908800000|1643500800000|src/with-fixable-error.js",
544547
]
545548
`);
546549

0 commit comments

Comments
 (0)