From cbdb42093ba67218a7a7578f54328b85c491a282 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sat, 5 Jul 2025 22:34:09 +0200 Subject: [PATCH] chore(tests): fix invalid jobparser tests - has_with had undetected structure error now failing the schema - empty_step and has_secrets are invalid and caught by the schema there no longer is a need for them --- act/jobparser/jobparser_test.go | 10 ---------- act/jobparser/testdata/empty_step.in.yaml | 8 -------- act/jobparser/testdata/empty_step.out.yaml | 7 ------- act/jobparser/testdata/has_secrets.in.yaml | 6 ++++-- act/jobparser/testdata/has_secrets.out.yaml | 16 ---------------- act/jobparser/testdata/has_with.in.yaml | 14 ++++++++------ act/jobparser/testdata/has_with.out.yaml | 14 ++++++++------ 7 files changed, 20 insertions(+), 55 deletions(-) delete mode 100644 act/jobparser/testdata/empty_step.in.yaml delete mode 100644 act/jobparser/testdata/empty_step.out.yaml delete mode 100644 act/jobparser/testdata/has_secrets.out.yaml diff --git a/act/jobparser/jobparser_test.go b/act/jobparser/jobparser_test.go index 06ed825c..5ecf9934 100644 --- a/act/jobparser/jobparser_test.go +++ b/act/jobparser/jobparser_test.go @@ -42,16 +42,6 @@ func TestParse(t *testing.T) { options: nil, wantErr: false, }, - { - name: "has_secrets", - options: nil, - wantErr: false, - }, - { - name: "empty_step", - options: nil, - wantErr: false, - }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/act/jobparser/testdata/empty_step.in.yaml b/act/jobparser/testdata/empty_step.in.yaml deleted file mode 100644 index 737ac0b2..00000000 --- a/act/jobparser/testdata/empty_step.in.yaml +++ /dev/null @@ -1,8 +0,0 @@ -name: test -jobs: - job1: - name: job1 - runs-on: linux - steps: - - run: echo job-1 - - diff --git a/act/jobparser/testdata/empty_step.out.yaml b/act/jobparser/testdata/empty_step.out.yaml deleted file mode 100644 index 06828e0e..00000000 --- a/act/jobparser/testdata/empty_step.out.yaml +++ /dev/null @@ -1,7 +0,0 @@ -name: test -jobs: - job1: - name: job1 - runs-on: linux - steps: - - run: echo job-1 diff --git a/act/jobparser/testdata/has_secrets.in.yaml b/act/jobparser/testdata/has_secrets.in.yaml index 64b9f69f..368c7d38 100644 --- a/act/jobparser/testdata/has_secrets.in.yaml +++ b/act/jobparser/testdata/has_secrets.in.yaml @@ -3,12 +3,14 @@ jobs: job1: name: job1 runs-on: linux - uses: .gitea/workflows/build.yml secrets: secret: hideme + steps: + - uses: .gitea/workflows/build.yml job2: name: job2 runs-on: linux - uses: .gitea/workflows/build.yml secrets: inherit + steps: + - uses: .gitea/workflows/build.yml diff --git a/act/jobparser/testdata/has_secrets.out.yaml b/act/jobparser/testdata/has_secrets.out.yaml deleted file mode 100644 index 23dfb803..00000000 --- a/act/jobparser/testdata/has_secrets.out.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: test -jobs: - job1: - name: job1 - runs-on: linux - uses: .gitea/workflows/build.yml - secrets: - secret: hideme ---- -name: test -jobs: - job2: - name: job2 - runs-on: linux - uses: .gitea/workflows/build.yml - secrets: inherit diff --git a/act/jobparser/testdata/has_with.in.yaml b/act/jobparser/testdata/has_with.in.yaml index 4e3dc745..ee5ebffc 100644 --- a/act/jobparser/testdata/has_with.in.yaml +++ b/act/jobparser/testdata/has_with.in.yaml @@ -3,13 +3,15 @@ jobs: job1: name: job1 runs-on: linux - uses: .gitea/workflows/build.yml - with: - package: service + steps: + - uses: .gitea/workflows/build.yml + with: + package: service job2: name: job2 runs-on: linux - uses: .gitea/workflows/build.yml - with: - package: module + steps: + - uses: .gitea/workflows/build.yml + with: + package: module diff --git a/act/jobparser/testdata/has_with.out.yaml b/act/jobparser/testdata/has_with.out.yaml index de79b803..6e66fecb 100644 --- a/act/jobparser/testdata/has_with.out.yaml +++ b/act/jobparser/testdata/has_with.out.yaml @@ -3,15 +3,17 @@ jobs: job1: name: job1 runs-on: linux - uses: .gitea/workflows/build.yml - with: - package: service + steps: + - uses: .gitea/workflows/build.yml + with: + package: service --- name: test jobs: job2: name: job2 runs-on: linux - uses: .gitea/workflows/build.yml - with: - package: module + steps: + - uses: .gitea/workflows/build.yml + with: + package: module