Skip to content
This repository has been archived by the owner on Jul 22, 2020. It is now read-only.

Commit

Permalink
Introduce E2E-Testing + Update README
Browse files Browse the repository at this point in the history
  • Loading branch information
sgraband committed Jan 27, 2020
1 parent 2ed4dbb commit 2623a3f
Show file tree
Hide file tree
Showing 8 changed files with 1,976 additions and 65 deletions.
3 changes: 3 additions & 0 deletions client/.testcaferc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"tsConfigPath": "./tests/tsconfig.json"
}
16 changes: 16 additions & 0 deletions client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,19 @@ Create a npm user and login to the npm registry, [more on npm publishing](https:
Publish packages with lerna to update versions properly across local packages, [more on publishing with lerna](https://github.com/lerna/lerna#publish).

npx lerna publish

## Running the testcafe tests

Build the Server

mvn install -U

Start client, server and the tests. (Client and Server will shutdown after the execution of the tests).

yarn e2etest

Start the tests if client and server are already running.

yarn testcafe:start

Please keep the mouse focus on the Testcafe window during the tests. Losing focus will cause tests to fail.
7 changes: 6 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,15 @@
"watch": "lerna run --parallel watch",
"publish": "yarn && yarn publish:latest",
"publish:latest": "lerna publish",
"publish:next": "lerna publish --exact --canary=next --npm-tag=next --yes"
"publish:next": "lerna publish --exact --canary=next --npm-tag=next --yes",
"theia:start": "cd browser-app && yarn start",
"testcafe:start": "testcafe chrome tests/test.ts",
"e2etest": "npm-run-all --parallel --aggregate-output theia:start testcafe:start"
},
"devDependencies": {
"lerna": "2.4.0",
"npm-run-all": "^4.1.5",
"testcafe": "^1.7.1",
"tslint": "^5.5.0"
},
"resolutions": {
Expand Down
19 changes: 10 additions & 9 deletions client/sprotty-ecore/src/di.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,25 @@ import {
} from "@glsp/sprotty-client/lib";
import executeCommandModule from "@glsp/sprotty-client/lib/features/execute/di.config";
import { Container, ContainerModule } from "inversify";
import {EditLabelUIAutocomplete} from "./features/edit-label-autocomplete";
import { EditLabelUI } from "sprotty/lib";

import { EditLabelUIAutocomplete } from "./features/edit-label-autocomplete";
import { LabelSelectionFeedback } from "./feedback";
import {
ArrowEdge,
BidirectionalArrowEdge,
CompositionEdge,
InheritanceEdge,
LabeledNode,
SEditableLabel,
IconAbstract,
IconClass,
IconDataType,
IconEnum,
IconInterface,
IconAbstract,
IconClass,
SLabelNodeAttribute,
SLabelNodeLiteral,
InheritanceEdge,
LabeledNode,
SEditableLabel,
SLabelNode,
BidirectionalArrowEdge
SLabelNodeAttribute,
SLabelNodeLiteral
} from "./model";
import {
ArrowEdgeView,
Expand Down
3 changes: 3 additions & 0 deletions client/tests/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"defaultPort": 3000
}
Loading

0 comments on commit 2623a3f

Please sign in to comment.