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

PMM-7 Run unit tests for QAN & add ci for setup page #1595

Merged
merged 6 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 28 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Test pipeline

on: pull_request
on:
pull_request:
paths:
- pmm-app/**

jobs:
build:
Expand Down Expand Up @@ -29,6 +32,28 @@ jobs:
path: pmm-app/dist/
if-no-files-found: error

unit_tests:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Run with Node 18
uses: actions/setup-node@v4
with:
node-version: "18"
cache: "yarn"
cache-dependency-path: pmm-app/yarn.lock

- name: Install deps
run: make prepare_release

- name: Run lint
run: cd pmm-app && yarn lint:check

- name: Run unit tests
run: cd pmm-app && yarn test:ci

code_coverage:
needs: build
runs-on: ubuntu-latest
Expand Down Expand Up @@ -57,7 +82,7 @@ jobs:
run: make generate_coverage

workflow_success:
needs: [code_coverage, build]
needs: [unit_tests, code_coverage, build]
name: Slack Notification success
runs-on: ubuntu-latest
env:
Expand All @@ -77,7 +102,7 @@ jobs:

workflow_failure:
if: ${{ failure() }}
needs: [code_coverage, build]
needs: [unit_tests, code_coverage, build]
name: Slack Notification failure
runs-on: ubuntu-latest
env:
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/setup-page.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Setup Page pipeline

on:
pull_request:
paths:
- setup-page/**

jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Run with Node 18
uses: actions/setup-node@v4
with:
node-version: "18"
cache: "npm"
cache-dependency-path: setup-page/package-lock.json

- name: Install deps
run: cd setup-page && npm ci

- name: Run lint
run: cd setup-page && npm run lint

- name: Run build
run: cd setup-page && npm run build
1 change: 1 addition & 0 deletions pmm-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"dev": "webpack -w -c ./.config/webpack/webpack.config.ts --env development",
"jest": "jest",
"lint": "yarn lint:dev",
"lint:check": "eslint --ext .tsx,.ts src/",
"lint:dev": "eslint --ext .tsx,.ts --fix src/",
"lint:fix": "yarn run lint --fix",
"server": "docker-compose up --build",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ jest.mock('shared/components/helpers/notification-manager');
jest.mock('antd/es/tooltip', () => <div className="tooltip" />);

jest.mock('./hooks/useHistogram', () => ({
useHistogram: jest.fn(({ theme }) => (
[getChartDataFromHistogramItems([{ frequency: 6175, range: '(0-3)' }], theme), true]
)),
useHistogram: jest.fn(({ theme }) => [
getChartDataFromHistogramItems([{ frequency: 6175, range: '(0-3)' }], theme),
true,
]),
}));

const originalConsoleError = console.error;
Expand Down Expand Up @@ -2696,6 +2697,10 @@ const panelState = {
describe('useFilters::', () => {
beforeEach(() => {
console.error = jest.fn();
// TODO: Grafana Tooltip component uses a react 18 hook - useId
// due to enzyme we are currently stuck at react 17, mocking for now
// @ts-ignore
React.useId = () => '';
});

afterEach(() => {
Expand All @@ -2717,7 +2722,6 @@ describe('useFilters::', () => {
textMetrics={textMetrics}
loading={false}
/>
,
</QueryAnalyticsProvider.Provider>,
);

Expand All @@ -2731,14 +2735,7 @@ describe('useFilters::', () => {
panelState,
}}
>
<Metrics
databaseType={Databases.mysql}
groupBy="queryid"
totals
metrics={metrics}
loading={false}
/>
,
<Metrics databaseType={Databases.mysql} groupBy="queryid" totals metrics={metrics} loading={false} />
</QueryAnalyticsProvider.Provider>,
);

Expand All @@ -2760,7 +2757,6 @@ describe('useFilters::', () => {
textMetrics={textMetrics}
loading={false}
/>
,
</QueryAnalyticsProvider.Provider>,
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ exports[`TimeDistributionChart chart test Renders correct 1`] = `
<Fragment>
<h
data={
Array [
Object {
[
{
"color": "#BD4848",
"description": "0.08%",
"name": "Lock Time",
"value": 1,
},
Object {
{
"color": "gray",
"description": "99.92%",
"name": "Other",
Expand Down
Loading
Loading