From 33961ef31917d179f21b6e0cd8dc2577f5406b6c Mon Sep 17 00:00:00 2001 From: MoyuScript Date: Sat, 7 Sep 2013 21:10:06 +0300 Subject: [PATCH] Disable screenshot storing --- .travis.yml | 2 -- tests/selenium.js | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1eea70..e6cf713 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,6 @@ env: - secure: "eW41gIqOizwO4pTgWnAAbW75AP7F+CK9qfSed/fSh4sJ9HWMIY1YRIaY8gjr+6jV/f7XVHcXuym6ZxgINYSkVKbF1JKxBJNLOXtSgNbVHSic58pYFvUjwxIBI9aPig9uux1+DbnpWqXFDTcACJSevQZE0xwmjdrSkDLgB0G34v8=" - secure: "Y2Av+Gd3z9uQEB36GwdOOuGka0hx0/HeitASEo59z934O8RxnmN9eNTXS7dDT3XtKtwxIyLTOEpS7qlRdWahH28hr/dS4xJj6ao58C+1xMcDs6NAPGmDxUlcJWpcGEsnjmXjQCc3fBioSTdpIBrK/gdvgpNh77UKG74Sk7Z+YGk=" - secure: "YI+YbTOGf2x4fPMKW+KhJiZWswoXT6xOKGwLfsQsVwmFX1LerJouil5D5iYOQuL4FE3pNaoJSNakIsokJQuGKJMmnPc8rdhMZuBJBk6MRghurE2Xe9qBHfuUBPlfD61nARESm4WDcyMwM0QVYaOKeY6aIpZ91qbUbyc60EEx3C4=" - - secure: "hdNNV/BnezrGn5Qp/WDCni6lUYOMjfwuowDfbkP1ynFU3T66OQkF99vqjLl25+S1WUAj1pybwOoXHdz0bjzgOjeBuFb3ylKmlh8XIpgyl4elI3DKjUHdm+Eu1YelQIqOhYvocWRUcJ659xkv3mh207E4HteGgcD2u0SKQ6YJl6k=" before_script: -- openssl aes-256-cbc -pass env:SERVICE_SECRET -in tests/certificate.pem.enc -d -a -out tests/certificate.pem - npm install -g grunt-cli - curl https://gist.github.com/niklasvh/6150144/raw/sauce_connect_setup.sh | bash diff --git a/tests/selenium.js b/tests/selenium.js index e6a7d10..af29b5c 100644 --- a/tests/selenium.js +++ b/tests/selenium.js @@ -267,7 +267,10 @@ }); }); - Bacon.combineWith(permissionRequest, drive, auth, Bacon.combineWith(uploadRequest, drive, auth, resultStream.doAction(mapResults).flatMap(createImages)).flatMap(executeRequest)).flatMap(executeRequestOriginal).onValue(uploadImages); + if (fs.existsSync('tests/certificate.pem')) { + Bacon.combineWith(permissionRequest, drive, auth, Bacon.combineWith(uploadRequest, drive, auth, resultStream.doAction(mapResults).flatMap(createImages)).flatMap(executeRequest)).flatMap(executeRequestOriginal).onValue(uploadImages); + } + resultStream.onEnd(callback); }); }); @@ -352,7 +355,7 @@ "exp": ~~(new Date().getTime() / 1000) + (30 * 60), "iat": ~~(new Date().getTime() / 1000 - 60) }, - key = require('fs').readFileSync('tests/certificate.pem', 'utf8'), + key = fs.readFileSync('tests/certificate.pem', 'utf8'), transporterTokenRequest = { method: 'POST', uri: 'https://accounts.google.com/o/oauth2/token',