Skip to content

Commit

Permalink
Merge pull request #51 from vlad-ko/feature/comp-to-flags
Browse files Browse the repository at this point in the history
adding component definition
  • Loading branch information
vlad-ko committed Jun 6, 2024
2 parents 08a1744 + 7b67313 commit 96737bd
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 27 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,33 +80,33 @@ jobs:
run: chmod +x codecov


## RUN tests an upload reports
# RUN tests an upload reports ## comment
- name: Run Service Testsuite with Coverage
run: vendor/bin/phpunit --testsuite="Services Tests" --coverage-clover=coverage-service.xml

- name: Upload Service coverage report #step 3
run: ./codecov -t ${CODECOV_DD_TOKEN} --url https://codecov.io -F service -f coverage-service.xml
run: ./codecov upload-process --disable-search -t ${{ secrets.CODECOV_TOKEN }} -n 'service'-${{ github.run_id }} -F service -f coverage-service.xml

- name: Run Controller Testsuite with Coverage
run: vendor/bin/phpunit --testsuite="Controllers Tests" --coverage-clover=coverage-controller.xml

- name: Upload Controller coverage report
run: ./codecov -t ${CODECOV_DD_TOKEN} --url https://codecov.io -F controller -f coverage-controller.xml
run: ./codecov upload-process -t ${{ secrets.CODECOV_TOKEN }} -n 'controller'-${{ github.run_id }} -F controller -f coverage-service.xml

- name: Run Unit Testsuite with Coverage
run: vendor/bin/phpunit --testsuite="Unit Tests" --coverage-clover=coverage-unit.xml

- name: Upload unit coverage report
run: ./codecov -t ${CODECOV_DD_TOKEN} --url https://codecov.io -F unit -f coverage-unit.xml
run: ./codecov upload-process -t ${{ secrets.CODECOV_TOKEN }} -n 'unit'-${{ github.run_id }} -F unit -f coverage-unit.xml

- name: Run Complete Testsuite with Coverage
run: vendor/bin/phpunit --coverage-clover=coverage.xml

- name: Upload overall coverage report
run: ./codecov -t ${CODECOV_DD_TOKEN} --url https://codecov.io -F backend -f coverage.xml

- name: Javascript tests using Jest
run: npm run test

- name: Upload Javascript coverage
run: ./codecov -t ${CODECOV_DD_TOKEN} --url https://codecov.io -F javascript -f coverage/coverage-final.json
run: ./codecov upload-process -t ${{ secrets.CODECOV_TOKEN }} -n 'javascript'-${{ github.run_id }} -F 'javascript' -f coverage/coverage-final.json

- name: Trigger notifications
run: ./codecov send-notifications -t ${{ secrets.CODECOV_TOKEN }}
13 changes: 6 additions & 7 deletions .github/workflows/pr-only.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,30 +78,29 @@ jobs:
run: vendor/bin/phpunit --testsuite="Services Tests" --coverage-clover=coverage-service.xml

- name: Upload Service coverage report #step 3
run: ./codecov --verbose upload-process --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} -n 'service'-${{ github.run_id }} -F service -f coverage-service.xml
run: ./codecov upload-process --disable-search -t ${{ secrets.CODECOV_TOKEN }} -n 'service'-${{ github.run_id }} -F service -f coverage-service.xml

- name: Run Controller Testsuite with Coverage
run: vendor/bin/phpunit --testsuite="Controllers Tests" --coverage-clover=coverage-controller.xml

- name: Upload Controller coverage report
run: ./codecov --verbose upload-process --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} -n 'controller'-${{ github.run_id }} -F controller -f coverage-service.xml
run: ./codecov upload-process -t ${{ secrets.CODECOV_TOKEN }} -n 'controller'-${{ github.run_id }} -F controller -f coverage-service.xml

- name: Run Unit Testsuite with Coverage
run: vendor/bin/phpunit --testsuite="Unit Tests" --coverage-clover=coverage-unit.xml

- name: Upload unit coverage report
run: ./codecov --verbose upload-process --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} -n 'unit'-${{ github.run_id }} -F unit -f coverage-unit.xml
run: ./codecov upload-process -t ${{ secrets.CODECOV_TOKEN }} -n 'unit'-${{ github.run_id }} -F unit -f coverage-unit.xml

- name: Run Complete Testsuite with Coverage
run: vendor/bin/phpunit --coverage-clover=coverage.xml

- name: Upload overall coverage report
run: ./codecov --verbose upload-process --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} -n 'backend'-${{ github.run_id }} -F backend -f coverage.xml

- name: Javascript tests using Jest
run: npm run test

- name: Upload Javascript coverage
run: ./codecov --verbose upload-process --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} -n 'javascript'-${{ github.run_id }} -F 'javascript' -f coverage/coverage-final.json
run: ./codecov upload-process -t ${{ secrets.CODECOV_TOKEN }} -n 'javascript'-${{ github.run_id }} -F 'javascript' -f coverage/coverage-final.json

- name: Trigger notifications
run: ./codecov send-notifications -t ${{ secrets.CODECOV_TOKEN }}

22 changes: 17 additions & 5 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ coverage:
flags:
- javascript

github_checks:
github_checks: #does not work if flags are configured
annotations: true

comment:
layout: "newheader, diff, flags, files"
layout: "newheader, diff, flags, components, files"
require_changes: false # if true: only post the comment if coverage changes
require_base: false # [yes :: must have a base report to post]
require_head: true # [yes :: must have a head report to post]
Expand Down Expand Up @@ -57,6 +57,18 @@ flags:
javascript:
paths:
- resources/js
backend:
paths:
- .*

component_management:
individual_components:
- component_id: "backend"
name: "backend"
paths:
- ".*"
flag_regexes: # List. Flags to be included in the component.
- "unit"
- "controller"
- "service"

codecov:
notify:
manual_trigger: true
2 changes: 1 addition & 1 deletion resources/js/classes/person.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}

getMenuOptions() {
return ['menu options'];
return 'menu options';
}

getPersonalData() {
Expand Down
16 changes: 10 additions & 6 deletions resources/js/classes/person.test.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
import Person from "./person";

var author = new Person("Ricky", "56", "The Danger", "Bobby");
var person = new Person("Ricky", "56", "The Danger", "Bobby");

test("Person class", ()=>{
expect(author.getName()).toBe("Ricky")
expect(person.getName()).toBe("Ricky")
})

test("Person class", ()=>{
expect(author.getNickname()).toBe("The Danger")
expect(person.getNickname()).toBe("The Danger")
})

test("Person class", ()=>{
expect(author.getLastName()).toBe("Bobby")
expect(person.getLastName()).toBe("Bobby")
})

test("Person class", ()=>{
expect(author.getEleven()).toBe(11)
expect(person.getEleven()).toBe(11)
})

test("Person class", ()=>{
expect(author.getAccessLevel()).toBe('admin');
expect(person.getAccessLevel()).toBe('admin');
})

test("Person class", ()=>{
expect(person.getMenuOptions()).toBe('menu options');
})

0 comments on commit 96737bd

Please sign in to comment.