diff options
| author | Matthias Villiger | 2020-10-20 11:18:54 +0000 |
|---|---|---|
| committer | Matthias Villiger | 2020-10-20 11:18:54 +0000 |
| commit | 1b64f36058bce42cead0538351393fd3a43b14fe (patch) | |
| tree | 73db2f3d4593e1bb9620bbb0c32820ba183cb23f | |
| parent | 487217b48c34528395537164079ff70b52014851 (diff) | |
| download | org.eclipse.scout.sdk-1b64f36058bce42cead0538351393fd3a43b14fe.tar.gz org.eclipse.scout.sdk-1b64f36058bce42cead0538351393fd3a43b14fe.tar.xz org.eclipse.scout.sdk-1b64f36058bce42cead0538351393fd3a43b14fe.zip | |
Merge @eclipse-scout/testing into @eclipse-scout/core
Because of cyclic dependencies between @eclipse-scout/testing and
@eclipse-scout/core
3 files changed, 12 insertions, 3 deletions
diff --git a/scout-hellojs-app/src/main/resources/archetype-resources/__rootArtifactId__.ui/package.json b/scout-hellojs-app/src/main/resources/archetype-resources/__rootArtifactId__.ui/package.json index 54f24fa4c..aa0193904 100644 --- a/scout-hellojs-app/src/main/resources/archetype-resources/__rootArtifactId__.ui/package.json +++ b/scout-hellojs-app/src/main/resources/archetype-resources/__rootArtifactId__.ui/package.json @@ -26,7 +26,6 @@ }, "devDependencies": { "@eclipse-scout/cli": ">=10.0.0-snapshot <10.0.0", - "@eclipse-scout/testing": ">=10.0.0-snapshot <10.0.0", "@eclipse-scout/releng": "^10.0.0", "@eclipse-scout/eslint-config": ">=10.0.0-snapshot <10.0.0", "eslint": "6.5.1", diff --git a/scout-hellojs-app/src/main/resources/archetype-resources/__rootArtifactId__.ui/src/test/js/test-index.js b/scout-hellojs-app/src/main/resources/archetype-resources/__rootArtifactId__.ui/src/test/js/test-index.js index 23871c722..8975d2006 100644 --- a/scout-hellojs-app/src/main/resources/archetype-resources/__rootArtifactId__.ui/src/test/js/test-index.js +++ b/scout-hellojs-app/src/main/resources/archetype-resources/__rootArtifactId__.ui/src/test/js/test-index.js @@ -1,6 +1,17 @@ -import {JasmineScout} from '@eclipse-scout/testing'; +/* + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * BSI Business Systems Integration AG - initial API and implementation + */ +import {JasmineScout} from '@eclipse-scout/core/src/testing/index'; import * as ref1 from '../../main/js/index'; + Object.assign({}, ref1); let context = require.context('./', true, /[sS]pec\.js$/); diff --git a/scout-helloworld-app/src/main/resources/archetype-resources/__rootArtifactId__.ui.html/package.json b/scout-helloworld-app/src/main/resources/archetype-resources/__rootArtifactId__.ui.html/package.json index e6483c706..7aa03bd45 100644 --- a/scout-helloworld-app/src/main/resources/archetype-resources/__rootArtifactId__.ui.html/package.json +++ b/scout-helloworld-app/src/main/resources/archetype-resources/__rootArtifactId__.ui.html/package.json @@ -27,7 +27,6 @@ }, "devDependencies": { "@eclipse-scout/cli": ">=10.0.0-snapshot <10.0.0", - "@eclipse-scout/testing": ">=10.0.0-snapshot <10.0.0", "@eclipse-scout/releng": "^10.0.0", "@eclipse-scout/eslint-config": ">=10.0.0-snapshot <10.0.0", "eslint": "6.5.1", |