-
Notifications
You must be signed in to change notification settings - Fork 63
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
GPII-1311: OLB should use WebSockets handler #415
Merged
Merged
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
87aae8d
Merge remote-tracking branch 'refs/remotes/GPII/master'
cstrobbe ed2cad0
Merge remote-tracking branch 'refs/remotes/GPII/review4'
cstrobbe d7f95f3
GPII-1311: OLB entry in win32 registry.
cstrobbe 3f743cf
GPII-1131: webSockets handler for OLB
cstrobbe 852d6d5
GPII-1131: webSockets handler for OLB
cstrobbe d1ca5f0
GPII-1311: OLB removed from win32.json
cstrobbe 2fd0ae6
GPII-1131: trying to resolve conflict in web.json
cstrobbe e4b40db
GPII-1311: OLB not in win32.json, so tests removed
cstrobbe 40731bb
GPII-1311: OLB not in win32.json, so tests removed
cstrobbe 3d8c465
GPII-1311: OLB not in win32.json, so tests removed
cstrobbe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,129 @@ | ||
| /* | ||
| GPII Integration and Acceptance Testing | ||
|
|
||
| Copyright 2015 Hochschule der Medien (HdM) / Stuttgart Media University | ||
|
|
||
| Licensed under the New BSD license. You may not use this file except in | ||
| compliance with this License. | ||
|
|
||
| The research leading to these results has received funding from the European Union's | ||
| Seventh Framework Programme (FP7/2007-2013) under grant agreement no. 289016. | ||
|
|
||
| You may obtain a copy of the License at | ||
| https://github.com/GPII/universal/blob/master/LICENSE.txt | ||
| */ | ||
|
|
||
| /*global require*/ | ||
|
|
||
| "use strict"; | ||
| var fluid = require("universal"), | ||
| gpii = fluid.registerNamespace("gpii"); | ||
|
|
||
| gpii.loadTestingSupport(); | ||
|
|
||
| var testDefs = [ | ||
| { | ||
| name: "Acceptance test with empty preference set for OLB", | ||
| userToken: "olb_empty", | ||
| solutionId: "eu.gpii.olb", | ||
| expected: { | ||
| "eu.gpii.olb": { | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: "Test for Online Banking demonstrator (OLB) with Online Flow Manager (German sign language).", | ||
| userToken: "olb_Lara", | ||
| solutionId: "eu.gpii.olb", | ||
| expected: { | ||
| "eu.gpii.olb": { | ||
| "language": "de-DE", | ||
| "signLanguageEnabled": true, | ||
| "signLanguage": "gsg", | ||
| "interpreterType": "human", | ||
| "interpreterName": "default" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: "Test for Online Banking demonstrator (OLB) with Online Flow Manager (US sign language).", | ||
| userToken: "olb_KimCallahan", | ||
| solutionId: "eu.gpii.olb", | ||
| expected: { | ||
| "eu.gpii.olb": { | ||
| "language": "en-US", | ||
| "signLanguageEnabled": true, | ||
| "signLanguage": "ase", | ||
| "interpreterType": "avatar", | ||
| "textStyle": "verdana" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: "Test for Online Banking demonstrator (OLB) with Online Flow Manager (contrast and large text).", | ||
| userToken: "olb_Carla", | ||
| solutionId: "eu.gpii.olb", | ||
| expected: { | ||
| "eu.gpii.olb": { | ||
| "language": "en-GB", | ||
| "textSize": 2, | ||
| "links": true, | ||
| "contrastTheme": "wb", | ||
| "signLanguageEnabled": false, | ||
| "signLanguage": "ils", | ||
| "lineSpacing": 2, | ||
| "inputsLarger": true | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: "Test for Online Banking demonstrator (OLB) with only application-specific terms.", | ||
| userToken: "olb_applicationSpecific_01", | ||
| solutionId: "eu.gpii.olb", | ||
| expected: { | ||
| "eu.gpii.olb": { | ||
| "textSize": 1.1, | ||
| "lineSpacing": 2, | ||
| "textStyle": "comic", | ||
| "toc": true, | ||
| "links": true, | ||
| "inputsLarger": true, | ||
| "contrastTheme": "yb", | ||
| "signLanguageEnabled": true, | ||
| "signLanguage": "ils", | ||
| "interpreterType": "avatar", | ||
| "interpreterName": "Neytiri", | ||
| "pictogramsEnabled": false | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: "Test for Online Banking demonstrator (OLB) with Online Flow Manager: unsupported sign language.", | ||
| userToken: "olb_QinKesheng", | ||
| solutionId: "eu.gpii.olb", | ||
| expected: { | ||
| "eu.gpii.olb": { | ||
| "language": "zho", | ||
| "signLanguageEnabled": true, | ||
| "signLanguage": "ils", | ||
| "interpreterType": "avatar" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: "Test for Online Banking demonstrator (OLB) with Online Flow Manager: simplified UI.", | ||
| userToken: "olb_Alicia_cmn", | ||
| solutionId: "eu.gpii.olb", | ||
| expected: { | ||
| "eu.gpii.olb": { | ||
| "language": "en-GB", | ||
| "contrastTheme": "wb", | ||
| "signLanguage": "ils", // see https://issues.gpii.net/browse/GPII-1125 | ||
| "simplifiedUiEnabled": true | ||
| } | ||
| } | ||
| } | ||
| ]; | ||
|
|
||
| module.exports = gpii.test.cloudBased.bootstrap(testDefs, __dirname); | ||
|
|
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,19 @@ | ||
| AcceptanceTests_olb.js | ||
|
|
||
| Description: | ||
| This is a set of acceptance tests for the Online Banking demonstrator (OLB) using the Online Flow Manager. | ||
| It relies on the following preference sets in ..\..\testData\preferences\acceptanceTests: | ||
| * olb_empty.json | ||
| * olb_Carla.json | ||
| * olb_KimCallahan.json | ||
| * olb_Lara.json | ||
| * olb_QinKesheng.json | ||
| * olb_applicationSpecific_01.json | ||
| * olb_Alicia_cmn.json | ||
|
|
||
|
|
||
| Requirements: | ||
| Since the Online Banking demonstrator uses the Online Flow Manager (or "Cloud-based Flow Manager"), there are no requirements other than a local instance of the GPII running with NODE_ENV set to "cloudBased.development.all.local" and starting the server from the "universal" folder by typing "node node_modules/kettle/lib/init.js gpii/configs/". | ||
| Note: | ||
| Using the Online Flow Manager is a temporary workaround until there is infrastructure that allows web applications to request settings through the local Flow Manager. | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the path must be the same as the solution id (eu.gpii.olb), short explanation: this is the way for both the browserChannel and the webSockets settingsHandler to know who and where their preferences are stored.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I see. I misread something that I had seen in your pull request for the Cloud4all site. Sorry.