Skip to content

Commit 021ce87

Browse files
committed
automatic project update
1 parent f8906cc commit 021ce87

File tree

60 files changed

+2628
-2878
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2628
-2878
lines changed

.eslintignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
node_modules/
22
src/main/docker/
33
src/test/javascript/protractor.conf.js
4-
src/test/javascript/jest.conf.js
4+
jest.conf.js
55
webpack/
66
target/
77
build/

.yo-rc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"testFrameworks": ["gatling", "protractor"],
1919
"languages": ["en"],
2020
"serverPort": 8080,
21-
"jhipsterVersion": "7.0.0-beta.0",
21+
"jhipsterVersion": "7.0.0-beta.1",
2222
"enableSocialSignIn": false,
2323
"useSass": true,
2424
"jhiPrefix": "jhi",

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# jhipsterSampleApplicationReact
22

3-
This application was generated using JHipster 7.0.0-beta.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v7.0.0-beta.0](https://www.jhipster.tech/documentation-archive/v7.0.0-beta.0).
3+
This application was generated using JHipster 7.0.0-beta.1, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1](https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1).
44

55
## Development
66

@@ -187,13 +187,13 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
187187
To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.
188188

189189
[jhipster homepage and latest documentation]: https://www.jhipster.tech
190-
[jhipster 7.0.0-beta.0 archive]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.0
191-
[using jhipster in development]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.0/development/
192-
[using docker and docker-compose]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.0/docker-compose
193-
[using jhipster in production]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.0/production/
194-
[running tests page]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.0/running-tests/
195-
[code quality page]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.0/code-quality/
196-
[setting up continuous integration]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.0/setting-up-ci/
190+
[jhipster 7.0.0-beta.1 archive]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1
191+
[using jhipster in development]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/development/
192+
[using docker and docker-compose]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/docker-compose
193+
[using jhipster in production]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/production/
194+
[running tests page]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/running-tests/
195+
[code quality page]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/code-quality/
196+
[setting up continuous integration]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/setting-up-ci/
197197
[gatling]: https://gatling.io/
198198
[node.js]: https://nodejs.org/
199199
[webpack]: https://webpack.github.io/

src/test/javascript/jest.conf.js jest.conf.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
const tsconfig = require('../../../tsconfig.json');
1+
const tsconfig = require('./tsconfig.json');
22

33
module.exports = {
44
transform: {
55
'^.+\\.tsx?$': 'ts-jest',
66
},
7-
rootDir: '../../../',
87
testURL: 'http://localhost/',
98
cacheDirectory: '<rootDir>/target/jest-cache',
109
coverageDirectory: '<rootDir>/target/test-results/',
11-
testMatch: ['<rootDir>/src/test/javascript/spec/**/@(*.)@(spec.ts?(x))'],
10+
testMatch: ['<rootDir>/src/main/webapp/app/**/@(*.)@(spec.ts?(x))'],
1211
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
1312
coveragePathIgnorePatterns: ['<rootDir>/src/test/javascript/'],
1413
moduleNameMapper: mapTypescriptAliasToJestAlias({
@@ -17,7 +16,7 @@ module.exports = {
1716
reporters: ['default', ['jest-junit', { outputDirectory: './target/test-results/', outputName: 'TESTS-results-jest.xml' }]],
1817
testResultsProcessor: 'jest-sonar-reporter',
1918
testPathIgnorePatterns: ['<rootDir>/node_modules/'],
20-
setupFiles: ['<rootDir>/src/test/javascript/spec/icons-mock.ts', '<rootDir>/src/test/javascript/spec/storage-mock.ts'],
19+
setupFiles: ['<rootDir>/src/main/webapp/app/setup-tests.ts'],
2120
globals: {
2221
'ts-jest': {
2322
tsconfig: './tsconfig.test.json',

0 commit comments

Comments
 (0)