projects / platform / framework / web / crosswalk-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c10c419)
spec: Remove annoying outputs from savePage test
authorCheng Zhao <zcbenz@gmail.com>
Wed, 13 Jan 2016 09:12:47 +0000 (17:12 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 15 Jan 2016 08:36:35 +0000 (16:36 +0800)
spec/api-browser-window-spec.js patch | blob | history
spec/fixtures/pages/save_page/index.html patch | blob | history
spec/fixtures/pages/save_page/test.js patch | blob | history

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 432c9a7..50a98ed 100644 (file)
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -455,31 +455,39 @@ describe('browser-window module', function() {
       });
     });
   });
-  describe('save page', function() {
-    var savePageCssPath, savePageDir, savePageHtmlPath, savePageJsPath;
-    savePageDir = path.join(fixtures, 'save_page');
-    savePageHtmlPath = path.join(savePageDir, 'save_page.html');
-    savePageJsPath = path.join(savePageDir, 'save_page_files', 'test.js');
-    savePageCssPath = path.join(savePageDir, 'save_page_files', 'test.css');
-    return it('should save page', function(done) {
+
+  describe('savePage method', function() {
+    const savePageDir = path.join(fixtures, 'save_page');
+    const savePageHtmlPath = path.join(savePageDir, 'save_page.html');
+    const savePageJsPath = path.join(savePageDir, 'save_page_files', 'test.js');
+    const savePageCssPath = path.join(savePageDir, 'save_page_files', 'test.css');
+
+    after(function() {
+      try {
+        fs.unlinkSync(savePageCssPath);
+        fs.unlinkSync(savePageJsPath);
+        fs.unlinkSync(savePageHtmlPath);
+        fs.rmdirSync(path.join(savePageDir, 'save_page_files'));
+        fs.rmdirSync(savePageDir);
+      } catch (e) {
+      }
+    });
+
+    it('should save page to disk', function(done) {
       w.webContents.on('did-finish-load', function() {
-        return w.webContents.savePage(savePageHtmlPath, 'HTMLComplete', function(error) {
+        w.webContents.savePage(savePageHtmlPath, 'HTMLComplete', function(error) {
           assert.equal(error, null);
           assert(fs.existsSync(savePageHtmlPath));
           assert(fs.existsSync(savePageJsPath));
           assert(fs.existsSync(savePageCssPath));
-          fs.unlinkSync(savePageCssPath);
-          fs.unlinkSync(savePageJsPath);
-          fs.unlinkSync(savePageHtmlPath);
-          fs.rmdirSync(path.join(savePageDir, 'save_page_files'));
-          fs.rmdirSync(savePageDir);
-          return done();
+          done();
         });
       });
-      return w.loadURL("file://" + fixtures + "/pages/save_page/index.html");
+      w.loadURL("file://" + fixtures + "/pages/save_page/index.html");
     });
   });
-  return describe('BrowserWindow options argument is optional', function() {
+
+  describe('BrowserWindow options argument is optional', function() {
     return it('should create a window with default size (800x600)', function() {
       var size;
       w.destroy();
diff --git a/spec/fixtures/pages/save_page/index.html b/spec/fixtures/pages/save_page/index.html
index 829233b..61445bc 100644 (file)
--- a/spec/fixtures/pages/save_page/index.html
+++ b/spec/fixtures/pages/save_page/index.html
@@ -1,6 +1,6 @@
 <html>
 <script type="text/javascript" src="test.js"></script>
-<script type="text/javascript" src="test.css"></script>
+<link href="test.css" rel="stylesheet">
 <body>
 </body>
 </html>
Domain: Web Framework / Web Runtime;