From 4cbfecf96363b344c4bee99bee2bce1ca2db11bb Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Wed, 4 Nov 2015 15:18:57 -0700
Subject: [PATCH] place failure screenshots in test/output

---
 .gitignore                   |  2 +-
 test/output/.empty           |  0
 test/support/pages/Common.js | 14 ++++++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 test/output/.empty

diff --git a/.gitignore b/.gitignore
index 7cf7e9772423..1f7d4ef35bd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ target
 .idea
 *.iml
 *.log
-screenshot*.png
+/test/output
 /esvm
 .htpasswd
 .eslintcache
diff --git a/test/output/.empty b/test/output/.empty
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/test/support/pages/Common.js b/test/support/pages/Common.js
index f2630b4eb673..afdf6176b517 100644
--- a/test/support/pages/Common.js
+++ b/test/support/pages/Common.js
@@ -63,7 +63,7 @@ define(function (require) {
 
       return function (reason) {
         var now = Date.now();
-        var filename = path.resolve(['./screenshot', now, testName, '.png'].join('_'));
+        var filename = ['failure', now, testName].join('_') + '.png';
 
         return self.saveScreenshot(filename)
         .finally(function () {
@@ -73,11 +73,17 @@ define(function (require) {
     },
 
     saveScreenshot: function saveScreenshot(filename) {
-      this.debug('Test Failed, taking screenshot "' + filename + '"');
+      var self = this;
+      var outDir = path.resolve('test', 'output');
 
-      return this.remote.takeScreenshot()
+      return self.remote.takeScreenshot()
       .then(function writeScreenshot(data) {
-        fs.writeFileSync(filename, data);
+        var filepath = path.resolve(outDir, filename);
+        self.debug('Test Failed, taking screenshot "' + filepath + '"');
+        fs.writeFileSync(filepath, data);
+      })
+      .catch(function (err) {
+        self.log('SCREENSHOT FAILED: ' + err);
       });
     }
   };