Skip to content

Commit

Permalink
Merge pull request #108 from avdev4j/add_link_step_in_CI
Browse files Browse the repository at this point in the history
Add a npm link step to avoid errors in tests
  • Loading branch information
joewhite101 committed Oct 26, 2020
2 parents 903019a + 19cf690 commit 0d4f3e3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
node-version: '12'
- run: npm ci
- run: npm run pretest
- run: npm link
- run: npm run test
if: >-
!contains(github.event.head_commit.message, '[skip ci]') &&
Expand Down
3 changes: 2 additions & 1 deletion test/server.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const constants = require('generator-jhipster/generators/generator-constants');
const expectedFiles = require('./utils/expected-files');

const appBaseName = 'entandoPlugin';
const mainClassName = 'EntandoPluginApp';
const { DOCKER_DIR, SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR } = constants;

describe('Subgenerator server of entando JHipster blueprint', () => {
Expand Down Expand Up @@ -311,7 +312,7 @@ describe('Subgenerator server of entando JHipster blueprint', () => {

it('Main application file contains Entando modification', () => {
assert.fileContent(
`${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/${appBaseName}App.java`,
`${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/${mainClassName}.java`,
'implements InitializingBean',
);
});
Expand Down

0 comments on commit 0d4f3e3

Please sign in to comment.