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.

Sign up for GitHub

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

Build: Fix CI checks #16535

Merged
merged 5 commits into from
Nov 12, 2021
Merged

Build: Fix CI checks #16535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b410d05
refactor: add comment to fix eslint error
gaetanmaisse Oct 31, 2021
e835a89
fix: update Preact preset filename
gaetanmaisse Oct 31, 2021
d363da7
e2e: skip source snippet cypress test with @storybook/html
gaetanmaisse Oct 31, 2021
3f3fbb4
Merge branch 'next' into fix-ci-6.4.beta23
gaetanmaisse Nov 11, 2021
0ca55ae
Add a repro config for Angular 12 and use it in E2E tests
gaetanmaisse Nov 11, 2021
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
5 changes: 3 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
command: yarn wait-on http://localhost:6000
- run:
name: Run E2E tests
command: yarn test:e2e-framework --clean --all --skip angular11 --skip angular --skip vue3 --skip web_components_typescript --skip cra
command: yarn test:e2e-framework --clean --all --skip angular11 --skip angular --skip angular12 --skip vue3 --skip web_components_typescript --skip cra
no_output_timeout: 5m
- store_artifacts:
path: /tmp/cypress-record
Expand All @@ -221,7 +221,8 @@ jobs:
name: Run E2E tests
# Do not test CRA here because it's done in PnP part
# TODO: Remove `web_components_typescript` as soon as Lit 2 stable is released
command: yarn test:e2e-framework vue3 angular angular11 web_components_typescript web_components_lit2
# TODO: Add `angular` as soon as Storybook is compatible with Angular 13
command: yarn test:e2e-framework vue3 angular12 angular11 web_components_typescript web_components_lit2
no_output_timeout: 5m
- store_artifacts:
path: /tmp/cypress-record
Expand Down
2 changes: 1 addition & 1 deletion app/preact/preset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('./dist/cjs/server/framework-preset-babel-preact');
module.exports = require('./dist/cjs/server/framework-preset-preact');
30 changes: 16 additions & 14 deletions cypress/generated/addon-docs.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,23 @@ describe('addon-docs', () => {
});

skipOn('vue3', () => {
it('should provide source snippet', () => {
cy.getDocsElement()
.find('.docblock-code-toggle')
.first()
.should('contain.text', 'Show code')
// use force click so cypress does not automatically scroll, making the source block visible on this step
.click({ force: true });
skipOn('html', () => {
it('should provide source snippet', () => {
cy.getDocsElement()
.find('.docblock-code-toggle')
.first()
.should('contain.text', 'Show code')
// use force click so cypress does not automatically scroll, making the source block visible on this step
.click({ force: true });

cy.getDocsElement()
.find('pre.prismjs')
.first()
.should(($div) => {
const text = $div.text();
expect(text).not.match(/^\(args\) => /);
});
cy.getDocsElement()
.find('pre.prismjs')
.first()
.should(($div) => {
const text = $div.text();
expect(text).not.match(/^\(args\) => /);
});
});
});
});
});
6 changes: 6 additions & 0 deletions lib/cli/src/repro-generators/configs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ export const angular11: Parameters = {
version: 'v11-lts',
};

export const angular12: Parameters = {
...baseAngular,
name: 'angular12',
version: 'v12-lts',
};

export const angular: Parameters = baseAngular;
// #endregion

Expand Down