Commit 4de8afb2 authored by Sam Saccone's avatar Sam Saccone

Merge pull request #1568 from tastejs/sjs/test-workup

Sjs/test workup
parents 08ceb647 921a9b27
......@@ -11,12 +11,16 @@
"index.html",
"learn.json"
],
"scripts": {
"test-server": "gulp test-server &",
"gulp": "gulp"
},
"dependencies": {
"express": "^4.10.0"
},
"devDependencies": {
"del": "^0.1.1",
"gulp": "^3.8.5",
"gulp": "^3.9.0",
"gulp-autoprefixer": "^1.0.1",
"gulp-cache": "^0.2.0",
"gulp-csso": "^0.2.9",
......
......@@ -9,10 +9,9 @@ get_changes ()
git diff HEAD origin/master --name-only | awk 'BEGIN {FS = "/"}; {print $1 "/" $2 "/" $3}' | grep -v \/\/ | grep examples | awk -F '[/]' '{print "--framework=" $2}'|uniq
}
npm i -g gulp
if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]
then
gulp
npm run gulp
git submodule add -b gh-pages https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} site > /dev/null 2>&1
cd site
if git checkout gh-pages; then git checkout -b gh-pages; fi
......@@ -30,15 +29,15 @@ else
if [ "${#changes}" = 0 ]
then
exit 0
else
changes="--framework=backbone"
fi
npm run test-server && \
cd tooling && \
echo $changes | xargs ./run.sh && \
cd ../tests && \
(gulp test-server &) && \
sleep 2 && \
echo $changes | xargs ./run.sh
fi
exit $?
fi
......@@ -23,7 +23,7 @@ function TestOperations(page) {
this.assertNewInputNotFocused = function () {
return page.getFocussedElementName()
.then(function(name) {
.then(function (name) {
assert.notEqual(name, 'new-todo');
});
};
......
{
"private": true,
"scripts": {
"lint": "pushd .. && jscs",
"postlint": "popd"
"lint": "cd .. && jscs"
},
"dependencies": {
"jscs": "^2.7.0"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment