-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from ATIX-AG/fix_tests
Fix github actions
- Loading branch information
Showing
10 changed files
with
120 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| --- | ||
| name: React and Javascript tests | ||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
||
| jobs: | ||
| test_js: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| node: [14] | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Setup Node | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ matrix.node }} | ||
| - run: npm install | ||
| - name: Linting | ||
| run: | | ||
| # FIXME: we need to fix the findings, first | ||
| #npm run lint | ||
| npm run stylelint | ||
| - name: Testing | ||
| run: npm run test | ||
| ... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "extends": [ | ||
| "stylelint-config-standard", | ||
| ], | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| module.exports = { | ||
| verbose: true, | ||
| testMatch: ['**/*.test.js'], | ||
| testPathIgnorePatterns: [ | ||
| '.local', | ||
| '.bundle', | ||
| '/node_modules/', | ||
| '<rootDir>/foreman/', | ||
| ], | ||
| moduleDirectories: ['node_modules', 'webpack'], | ||
| testURL: 'http://localhost/', | ||
| collectCoverage: true, | ||
| collectCoverageFrom: [ | ||
| 'webpack/**/*.js', | ||
| '!webpack/index.js', | ||
| '!webpack/test_setup.js', | ||
| '!webpack/**/bundle*', | ||
| '!webpack/stories/**', | ||
| '!webpack/**/*stories.js', | ||
| ], | ||
| coverageReporters: ['text', 'lcov'], | ||
| moduleNameMapper: { | ||
| '^.+\\.(png|gif|css|scss)$': 'identity-obj-proxy', | ||
| }, | ||
| globals: { | ||
| __testing__: true, | ||
| }, | ||
| transform: { | ||
| '^.+\\.js$': 'babel-jest', | ||
| }, | ||
| setupFiles: [ | ||
| 'raf/polyfill', | ||
| 'jest-prop-type-error', | ||
| './webpack/test_setup.js', | ||
| ], | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,9 +3,6 @@ | |
| "version": "0.9.3", | ||
| "description": "foreman application centric deployment", | ||
| "main": "index.js", | ||
| "directories": { | ||
| "test": "test" | ||
| }, | ||
| "peerDependencies": { | ||
| "@theforeman/vendor": ">= 10.1.0" | ||
| }, | ||
|
|
@@ -17,67 +14,32 @@ | |
| "babel-plugin-transform-class-properties": "^6.24.1", | ||
| "babel-preset-env": "^1.6.0", | ||
| "babel-preset-react": "^6.24.1", | ||
| "eslint": "^6.7.2", | ||
| "jest": "^23.6.0", | ||
| "jest-prop-type-error": "^1.1.0", | ||
| "lodash": "^4.17.11", | ||
| "prettier": "^1.19.1", | ||
| "react-redux-test-utils": "^0.1.1", | ||
| "sortabular": "^1.5.1", | ||
| "stylelint": "^9.3.0", | ||
| "stylelint-config-standard": "^18.0.0", | ||
| "table-resolver": "^3.2.0" | ||
| }, | ||
| "scripts": { | ||
| "test": "node node_modules/.bin/jest --no-cache" | ||
| "lint": "tfm-lint --plugin -d *.js,webpack", | ||
| "lint-fix": "tfm-lint --plugin -d *.js,webpack --fix", | ||
| "stylelint": "stylelint webpack/**/*.scss", | ||
| "stylelint-fix": "stylelint webpack/**/*.scss --fix", | ||
| "test": "jest --no-cache" | ||
| }, | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "git+https://github.com/ATIX-AG/foreman_acd.git" | ||
| }, | ||
| "author": "", | ||
| "author": "ATIX AG <[email protected]>", | ||
| "license": "ISC", | ||
| "bugs": { | ||
| "url": "https://atix.de" | ||
| "url": "https://github.com/ATIX-AG/foreman_acd/issues" | ||
| }, | ||
| "homepage": "https://atix.de", | ||
| "jest": { | ||
| "verbose": true, | ||
| "testMatch": [ | ||
| "**/*.test.js" | ||
| ], | ||
| "testPathIgnorePatterns": [ | ||
| ".local", | ||
| ".bundle", | ||
| "/node_modules/", | ||
| "<rootDir>/foreman/" | ||
| ], | ||
| "moduleDirectories": [ | ||
| "node_modules", | ||
| "webpack" | ||
| ], | ||
| "testURL": "http://localhost/", | ||
| "collectCoverage": true, | ||
| "collectCoverageFrom": [ | ||
| "webpack/**/*.js", | ||
| "!webpack/index.js", | ||
| "!webpack/test_setup.js", | ||
| "!webpack/**/bundle*", | ||
| "!webpack/stories/**", | ||
| "!webpack/**/*stories.js" | ||
| ], | ||
| "coverageReporters": [ | ||
| "lcov" | ||
| ], | ||
| "moduleNameMapper": { | ||
| "^.+\\.(png|gif|css|scss)$": "identity-obj-proxy" | ||
| }, | ||
| "globals": { | ||
| "__testing__": true | ||
| }, | ||
| "transform": { | ||
| "^.+\\.js$": "babel-jest" | ||
| }, | ||
| "setupFiles": [ | ||
| "raf/polyfill", | ||
| "jest-prop-type-error", | ||
| "./webpack/test_setup.js" | ||
| ] | ||
| } | ||
| "homepage": "https://atix.de" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
webpack/components/ExistingHostSelection/ExistingHostSelection.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 10 additions & 10 deletions
20
webpack/components/ParameterSelection/ParameterSelection.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| @import '~@theforeman/vendor/scss/variables'; | ||
|
|
||
| .param_selection_modal { | ||
| margin-top: 0; | ||
| margin-bottom: 0; | ||
| height: 100%; | ||
| width: 80%; | ||
| max-width: none !important; | ||
| margin-top: 0; | ||
| margin-bottom: 0; | ||
| height: 100%; | ||
| width: 80%; | ||
| max-width: none !important; | ||
| } | ||
|
|
||
| .complex_data_modal { | ||
| margin-top: 0; | ||
| margin-bottom: 0; | ||
| height: 80%; | ||
| width: 40%; | ||
| max-width: none !important; | ||
| margin-top: 0; | ||
| margin-bottom: 0; | ||
| height: 80%; | ||
| width: 40%; | ||
| max-width: none !important; | ||
| } |