Skip to content

Commit

Permalink
Merge pull request #28 from Pearson-Higher-Ed/DES-856
Browse files Browse the repository at this point in the history
chore: pull run_selenium_tests.sh from npm-scripts && update license …
  • Loading branch information
umahaea authored Nov 29, 2017
2 parents ddb4cdd + 2c1df9e commit 2c31c04
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 120 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ node_js:
- 4.2
script:
- npm run ci
- chmod 777 ./node_modules/@pearson-components/npm-scripts/shell_scripts/run_selenium_ci_tests.sh
- export TEST_GROUP=desktop-regression
- "./node_modules/@pearson-components/npm-scripts/shell_scripts/run_selenium_ci_tests.sh"
deploy:
provider: npm
email: [email protected]
Expand All @@ -14,3 +17,6 @@ deploy:
on:
branch: master
tags: true
env:
global:
secure: iaonK0LD5C8YfooAUmXf7wL72L4jxR5Z3FztZEEzDfQ2ewUAamOaM6ft3dhmj9B8yXROR4PhgfRArrVtqIv1ECsuq0PvL9o5zb56YUu6iAJiu7sYggnfYPhc5qcO+v9/5tRkjICLfeajdN8KdOIuEW4Z55ZC063JLhQCdXcFQ9aSc5CauQp/mWI7Oo9BuDLUSWh4ZkO/WvHxAadzKQTrVyIrOsQraAHZWAXhWjwdlAsV/d++qaQ9j+yWaheGagt/VQV2aqZodffyfCrQEtfr3k74WxFgQVtu3ZKG5VgeBeestV7eyBWTrXlKvnS5VhgASLR9fh0sNbUNrow/Hf8PxznRFCx/TDIXB12Y+Lb17ZbutM4eqQsTfHYhrp7lAx+t8hTcFWvMQs1HvWjuO5W35E371p9+8hSIADSAtA+SP88gVusJRVBe+Sv0VqwIPEKYii4WFbyfQd/VBtk5CooPi2wtZvOj9lSR0k7KeMBf2IGipINDKm296g+uE7KJc4WTF2nx0fdNmSLEie3MVU6YVh4HubEFOlK3CMSEgxut+D2j83Lfj9QBy51bkfZfd/jz/Z5gCFLI/9PgNkaHJFRNKMaAn7QDNFdH8DmFWSdv70ywNXO7MINNFyHPWgpdIf9Adqo9NRlL3qUa/KsRR0JwNDS4i6UVwblwGBYjEoBld48=
26 changes: 16 additions & 10 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
Copyright © 2017 Pearson Education, Inc.
All Rights Reserved.

NOTICE: All information contained herein is, and remains
the property of Pearson Education, Inc. The intellectual and technical concepts contained
herein are proprietary to Pearson Education, Inc. and may be covered by U.S. and Foreign Patents,
patent applications, and are protected by trade secret or copyright law.
Dissemination of this information, reproduction of this material, and copying or distribution of this software
is strictly forbidden unless prior written permission is obtained
from Pearson Education, Inc.
MIT License
Copyright (c) 2017, Pearson Education, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"inline-loader": "^0.1.1"
},
"devDependencies": {
"@pearson-components/npm-scripts": "^0.5.6",
"babel-core": "~6.3.17",
"babel-eslint": "~4.1.6",
"babel-loader": "~6.2.0",
Expand Down
110 changes: 0 additions & 110 deletions test/shell_scripts/run_tests.sh

This file was deleted.

0 comments on commit 2c31c04

Please sign in to comment.