Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update master #331

Merged
merged 35 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e299d62
Blui 4197 no merge
JeffGreiner-eaton Jun 21, 2023
b849485
add pull request target with wildcard branches
JeffGreiner-eaton Jun 23, 2023
9bf9d8c
Merge pull request #300 from etn-ccis/feature/blui-4197-update
JeffGreiner-eaton Jun 23, 2023
6ff6fc0
test without on pull request in caller
JeffGreiner-eaton Jun 23, 2023
dc309c2
Merge pull request #302 from etn-ccis/feature/workflow-call
JeffGreiner-eaton Jun 23, 2023
0fe8f83
try instructions for caller
JeffGreiner-eaton Jun 23, 2023
4dae9bc
Merge pull request #304 from etn-ccis/feature/add-instructions
JeffGreiner-eaton Jun 23, 2023
abb176b
remove branch input
JeffGreiner-eaton Jun 23, 2023
6ce5d1e
Merge pull request #306 from etn-ccis/feature/update-remove-branch
JeffGreiner-eaton Jun 23, 2023
ff24f4b
blui 4197 update call to match branches
JeffGreiner-eaton Jun 26, 2023
cf4389b
Bump @testing-library/react from 12.1.3 to 12.1.5
dependabot[bot] Jul 1, 2023
dbf0787
Merge pull request #310 from etn-ccis/dependabot/npm_and_yarn/dev/tes…
JeffGreiner-eaton Jul 3, 2023
b339702
Merge pull request #309 from etn-ccis/feature/4197-update-pr-branches
daileytj Jul 7, 2023
94b56d3
Bump semver from 5.7.1 to 5.7.2
dependabot[bot] Jul 11, 2023
98a1f0b
Merge pull request #311 from etn-ccis/dependabot/npm_and_yarn/semver-…
joebochill Jul 11, 2023
676d571
Bump word-wrap from 1.2.3 to 1.2.4
dependabot[bot] Jul 18, 2023
8d7dc66
update ci browser tools
JeffGreiner-eaton Jul 19, 2023
75bf3b9
Merge pull request #312 from etn-ccis/dependabot/npm_and_yarn/word-wr…
JeffGreiner-eaton Jul 19, 2023
e8337e6
Bump placeholder-loading from 0.5.0 to 0.6.0
dependabot[bot] Aug 1, 2023
0dd7ab1
Merge pull request #313 from etn-ccis/dependabot/npm_and_yarn/dev/pla…
daileytj Aug 1, 2023
5827bdf
remove types & branches
JeffGreiner-eaton Aug 7, 2023
cffaf67
Merge pull request #315 from etn-ccis/feature/blui-4197
JeffGreiner-eaton Aug 7, 2023
54032a7
blui 3743 no merge
JeffGreiner-eaton Sep 11, 2023
a309c45
set status as info and not block pr
JeffGreiner-eaton Sep 11, 2023
ffe3804
use frozen lock & set parallel on ui test
JeffGreiner-eaton Sep 11, 2023
d987eb6
set no record ui test
JeffGreiner-eaton Sep 11, 2023
865f8a6
no cypress cloud needed
JeffGreiner-eaton Sep 11, 2023
5612334
test if target passes in action type
JeffGreiner-eaton Sep 11, 2023
2ccf0e7
Test GH actions
ektaghag-eaton Sep 13, 2023
3740611
revert change in read me
JeffGreiner-eaton Sep 14, 2023
7d7b070
Merge pull request #323 from etn-ccis/feature/blui-3743-gh-ci
JeffGreiner-eaton Sep 14, 2023
538f2c7
Bump get-func-name from 2.0.0 to 2.0.2
dependabot[bot] Sep 27, 2023
034bddc
Merge pull request #326 from etn-ccis/dependabot/npm_and_yarn/get-fun…
JeffGreiner-eaton Sep 28, 2023
ecd3285
update if condition & skip if dependabot
JeffGreiner-eaton Sep 28, 2023
01cbd33
Merge pull request #328 from etn-ccis/feature/ignore-bot-firebase
JeffGreiner-eaton Oct 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 0 additions & 119 deletions .circleci/config.yml

This file was deleted.

126 changes: 126 additions & 0 deletions .github/workflows/blui-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
name: CI Run

on:
push:
branches: [ "dev", "master" ]
pull_request:
branches: [ "dev", "master" ]
pull_request_target:
types:
- opened
branches:
- '*/*'

permissions:
pull-requests: write
contents: read

jobs:
prettier_lint:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn --frozen-lockfile
- run: yarn prettier
- run: yarn lint

unit_test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn --frozen-lockfile
- run: yarn test --coverage
- name: Upload to Codecov
uses: codecov/codecov-action@v3
with:
directory: ./coverage/
files: clover.xml
flags: unittests
name: codecov-report
verbose: true

build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn --frozen-lockfile
- run: yarn build
- name: Save build
uses: actions/upload-artifact@v3
with:
name: build
if-no-files-found: error
path: build

cypress-run:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
needs: build
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'

- name: Cypress install
uses: cypress-io/github-action@v6
with:
runTests: false

- name: Download the build folder
uses: actions/download-artifact@v3
with:
name: build
path: build

- name: Cypress run
uses: cypress-io/github-action@v6
with:
start: yarn start:cytest && yarn cy:run
wait-on: ${{ matrix.node-version == 16 && 'http://[::1]:3000' || 'http://localhost:3000' }}
wait-on-timeout: 300
browser: chrome

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
with:
directory: cypress-coverage
files: clover.xml
flags: uitests
name: codecov-report
verbose: true
3 changes: 1 addition & 2 deletions .github/workflows/blui-pr-actions.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name: blui-pr-actions

on:
pull_request_target:
types:
- opened

permissions:
pull-requests: write
contents: read
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ name: Deploy to Firebase Hosting on PR
'on': pull_request
jobs:
build_and_preview:
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
if: |
github.actor != 'dependabot[bot]' ||
(github.event.pull_request.head.repo.full_name == github.repository)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# React Design Patterns
## React Design Patterns

[![](https://img.shields.io/circleci/project/github/etn-ccis/blui-react-design-patterns/master.svg?style=flat)](https://circleci.com/gh/etn-ccis/blui-react-design-patterns/tree/master) [![codecov](https://codecov.io/gh/etn-ccis/blui-react-design-patterns/branch/master/graph/badge.svg?token=GG1T9203PD)](https://codecov.io/gh/etn-ccis/blui-react-design-patterns)

Expand Down
31 changes: 11 additions & 20 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
codecov:
require_ci_to_pass: yes
coverage:
precision: 2
round: down
range: "50...75"
status:
project: yes
patch: yes
changes: no
parsers:
gcov:
branch_detection:
conditional: yes
loop: yes
method: no
macro: no
comment:
layout: "reach,diff,flags,tree"
behavior: default
require_changes: no
status:
project:
default:
target: 50%
threshold: 5%
informational: true
patch:
default:
target: 50%
threshold: 5%
informational: true
16 changes: 16 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { defineConfig } from 'cypress'

export default defineConfig({
video: false,
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
return require('./cypress/plugins/index.js')(on, config)
},
},
component: {
setupNodeEvents(on, config) {},
specPattern: 'src/**/*spec.{js,jsx,ts,tsx}',
},
})
7 changes: 0 additions & 7 deletions cypress.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ describe('Collapsible app bar', () => {
cy.visit('http://localhost:3000/collapsible');
});

it.skip('should display toolbar height 154', () => {
cy.get('[data-cy=toolbar]').should('be.visible').invoke('prop', 'scrollHeight').should('eq', 154);
it('should display toolbar height', () => {
cy.get('[data-cy=toolbar]').should('be.visible')
.invoke('prop','scrollHeight').should('equal', 157);
});

it.skip('should display toolbar height 64 on scroll', () => {
it('should display toolbar height 64 on scroll', () => {
cy.get('#page-body').scrollIntoView({ duration: 1000, offset: { top: 0, left: 0 } });
cy.get('[data-cy=toolbar]')
.should('be.visible')
.should('contain.text', 'Gary Steel Works')
.invoke('prop', 'scrollHeight')
.should('eq', 64);
.should('equal', 64);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@ describe('Contextual App Bar', () => {
cy.get('[data-cy=delete-btn]').should('be.disabled')
});

it.skip('should display header checkbox indeterminate', () => {
it('should display header checkbox indeterminate', () => {
cy.get('[data-cy=table-cell-checkbox]').first().click()
cy.get('[data-cy=table-header-checkbox]').find('input')
.filter('input.PrivateSwitchBase-input-529')
.should('have.attr', 'data-indeterminate', 'true')
});

it.skip('should not display header checkbox indeterminate', () => {
it('should not display header checkbox indeterminate', () => {
cy.get('[data-cy=table-header-checkbox]').click()
cy.get('[data-cy=table-header-checkbox]').find('input')
.filter('input.PrivateSwitchBase-input-529')
.should('have.attr', 'data-indeterminate', 'false')
});

Expand Down
File renamed without changes.
File renamed without changes.
Loading
Loading