Merge pull request nwjs#658 from owenc4a4/test

rogerwang · rogerwang · commit 90abcc8cd5e4 · 2013-04-22T06:09:21.000-07:00
[Test] fix bug of some test, add test case for nwjs#655
diff --git a/tests/README.md b/tests/README.md
@@ -1,7 +1,11 @@
 ## Prerequisite
 
-node-webkit didn't ship third party node modules required for testing, you
-need to install them. We use `nw-gyp` to build native modules. So please run this:
+* node-webkit didn't ship third party node modules required for testing, you
+need to install them.
+* We use `nw-gyp` to build native modules.
+* We have test case that needs a http server e.g. apache. Please open port 80 and 8080 then put `tests/automatic_tests/node-remote/node_remote_test.html`to the http server document root.
+
+So please run this:
 
 ````bash
 $ npm install -g nw-gyp
@@ -20,11 +24,11 @@ $ /path-to-node-webkit src/content/nw/tests
 ## Command line options
 
     $ /path-to-node-webkit src/content/nw/tests --help
-    
+
       Usage: nw-test [options]
-    
+
       Options:
-    
+
         -h, --help             output usage information
         -V, --version          output the version number
         -S, --silent           hide the browser window and quit when done (run silently)
diff --git a/tests/manual_tests/menu/index.html b/tests/manual_tests/menu/index.html
@@ -1,7 +1,7 @@
 <html>
 <head>
-  <script type="text/javascript" src="../zepto.min.js"></script>
-  <script type="text/javascript" src="../assert.js"></script>
+  <script type="text/javascript" src="../../zepto.min.js"></script>
+  <script type="text/javascript" src="../../assert.js"></script>
 </head>
 <body>
 <script>
@@ -176,13 +176,13 @@
       document.body.appendChild(element);
     }
   }));
-  
+
   sub1.append(new gui.MenuItem({
     type: 'checkbox',
     checked: true, //<------------------------------------------------!!!!!!
     label: 'Test CheckBox'
   }));
-  
+
   var sub2 = new gui.Menu();
   sub2.append(new gui.MenuItem({
     label: 'Test2',
@@ -199,7 +199,7 @@
   gc();
 </script>
 <script>
-  document.body.addEventListener('contextmenu', function(ev) { 
+  document.body.addEventListener('contextmenu', function(ev) {
     ev.preventDefault();
     menu.popup(ev.x, ev.y);
     return false;
diff --git a/tests/manual_tests/test/index.html b/tests/manual_tests/test/index.html
@@ -37,7 +37,7 @@ <h2>file dialog</h2>
     var list = document.getElementsByName('file');
     for (var i = 0; i < list.length; i++) {
       if (process.platform == 'win32') {
-    	  list[i].nwworkingdir = dir_win;
+    	  list[i].nwworkingdir = dir_win[i];
       } else {
       	list[i].nwworkingdir = dir_unix[i];
       }
diff --git a/tests/manual_tests/tray/index.html b/tests/manual_tests/tray/index.html
@@ -1,7 +1,7 @@
 <html>
 <head>
-  <script type="text/javascript" src="../zepto.min.js"></script>
-  <script type="text/javascript" src="../assert.js"></script>
+  <script type="text/javascript" src="../../zepto.min.js"></script>
+  <script type="text/javascript" src="../../assert.js"></script>
 </head>
 <body>
 <script>
diff --git a/tests/manual_tests/window/index.html b/tests/manual_tests/window/index.html
@@ -83,7 +83,8 @@
 <button onclick="win.setResizable(true)">setResizable(true)</button>
 <button onclick="win.setResizable(false)">(false)</button>
 <br/>
-<button onclick="win.setAlwaysOnTop(true)">setAlwaysOnTop(true)</button>
+<p>Focus another application within 2sec, popup window should on top.</p>
+<button onclick="setTimeout(function(){win.setAlwaysOnTop(true);},2000)">setAlwaysOnTop(true)</button>
 <button onclick="win.setAlwaysOnTop(false)">(false)</button>
 <br/>
 <button onclick="win.zoomLevel = 2">set zoomLevel to 2</button>

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ <h2>file dialog</h2>`
`37`	`37`	`var list = document.getElementsByName('file');`
`38`	`38`	`for (var i = 0; i < list.length; i++) {`
`39`	`39`	`if (process.platform == 'win32') {`
`40`		`- list[i].nwworkingdir = dir_win;`
	`40`	`+ list[i].nwworkingdir = dir_win[i];`
`41`	`41`	`} else {`
`42`	`42`	`list[i].nwworkingdir = dir_unix[i];`
`43`	`43`	`}`