Skip to content

Commit

Permalink
ci test commit
Browse files Browse the repository at this point in the history
  • Loading branch information
foxriver76 committed Nov 20, 2023
1 parent 4dd1138 commit b487ec3
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 49 deletions.
40 changes: 0 additions & 40 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,48 +22,8 @@ concurrency:
cancel-in-progress: true

jobs:
# Performs quick checks before the expensive test runs
# check-and-lint:
# if: contains(github.event.head_commit.message, '[skip ci]') == false
#
# runs-on: ubuntu-latest
#
# steps:
# - uses: actions/checkout@v3
# - name: Use Node.js 16.x
# uses: actions/setup-node@v3
# with:
# node-version: 16.x
#
# - name: Install Dependencies
# run: npm install

# Runs adapter tests on all supported node versions and OSes
# adapter-tests:
# if: contains(github.event.head_commit.message, '[skip ci]') == false
#
# needs: [check-and-lint]
#
# runs-on: ubuntu-latest
#
# steps:
# - uses: actions/checkout@v3
# - name: Use Node.js 16.x
# uses: actions/setup-node@v3
# with:
# node-version: 16.x
#
# - name: Install Dependencies
# run: npm install --ignore-scripts
#
# - name: Run local tests
# run: npm test

adapter-tests-gui:
if: contains(github.event.head_commit.message, '[skip ci]') == false

# needs: [adapter-tests]

runs-on: ubuntu-latest

steps:
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"@alcalzone/release-script-plugin-license": "^3.5.9",
"@iobroker/vis-2-widgets-testing": "^0.3.0",
"@tsconfig/node16": "^16.1.1",
"@types/mocha": "^10.0.4",
"chai": "^4.3.10",
"gulp": "^4.0.2",
"iobroker.web": "*",
Expand Down
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@
"not ie <= 11",
"not op_mini all"
]
}
}
2 changes: 1 addition & 1 deletion src/public/material-icons/baseline.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/public/material-icons/outline.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/public/material-icons/round.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/public/material-icons/sharp.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/public/material-icons/twotone.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/src/Runtime.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,8 @@ class Runtime extends GenericApp {
}

if (!file || file === '{}') {
this.setState({ showProjectsDialog: true });

// read if show projects dialog allowed
const obj = await this.socket.getObject(`system.adapter.${this.adapterName}.${this.instance}`);
if (this.state.runtime && obj.native.doNotShowProjectDialog) {
Expand Down
6 changes: 3 additions & 3 deletions test/testAdapter.gui.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const helper = require('@iobroker/vis-2-widgets-testing');

describe('vis', () => {
before(async function (){
this.timeout(180000);
this.timeout(180_000);

// install js-controller, web and vis-2
await helper.startIoBroker({
Expand All @@ -20,7 +20,7 @@ describe('vis', () => {
});

it('Check all widgets', async function (){
this.timeout(120000);
this.timeout(120_000);
const widgetSets = await helper.palette.getListOfWidgetSets();
console.log(`Widget sets found: ${widgetSets.join(', ')}`);
for (let s = 0; s < widgetSets.length; s++) {
Expand All @@ -34,7 +34,7 @@ describe('vis', () => {
});

after(async function () {
this.timeout(5000);
this.timeout(5_000);
await helper.stopBrowser();
console.log('BROWSER stopped');
await helper.stopIoBroker();
Expand Down

0 comments on commit b487ec3

Please sign in to comment.