Merge pull request #1311 from lzhan/next

rm wait() from func tests
YahooArchive · Jan 22, 2014 · ca7f195 · ca7f195
2 parents dd5572b + 0cfd9b5
commit ca7f195
Show file tree

Hide file tree

Showing 118 changed files with 2,797 additions and 1,838 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,6 @@ script:
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-  - "wget -nv http://selenium.googlecode.com/files/selenium-server-standalone-2.30.0.jar"
-  - "java -jar selenium-server-standalone-2.30.0.jar -p 4444 > /dev/null &"
+  - "wget -nv http://selenium.googlecode.com/files/selenium-server-standalone-2.39.0.jar"
+  - "java -jar selenium-server-standalone-2.39.0.jar -p 4444 > /dev/null &"
   - "sleep 6"
diff --git a/examples/newsboxes/application.json b/examples/newsboxes/application.json
@@ -1,7 +1,7 @@
 [{
     "settings": ["master"],
 
-    "appPort": 8000,
+    "appPort": 8666,
     "builds": {
         "html5app": {
             "attachManifest": true,

diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
         "mojito-cli": "~0.1",
         "node-static": ">0.6.8",
         "wrench": "~1.3.9",
-        "yahoo-arrow": "0.0.87",
+        "yahoo-arrow": "0.0.89",
         "portfinder": "0.2.1"
     },
     "optionalDependencies": {

diff --git a/tests/func/applications/frameworkapp/common/application.json b/tests/func/applications/frameworkapp/common/application.json
@@ -10,7 +10,7 @@
       "myconfig2": "This is myconfig2 from top application.json",
       "myconfig3": "This is myconfig3 from top application.json"
     },
-    "appPort": 4081,
+    "appPort": 8666,
     "yui": {
       "config": {
         "debug": true,

diff --git a/tests/func/applications/frameworkapp/routing/qetests/suite.json b/tests/func/applications/frameworkapp/routing/qetests/suite.json
diff --git a/tests/func/applications/frameworkapp/routing/qetests/tests/RoutingTest/routing-tests.js b/tests/func/applications/frameworkapp/routing/qetests/tests/RoutingTest/routing-tests.js
diff --git a/tests/func/applications/frameworkapp/serveronly/application.json b/tests/func/applications/frameworkapp/serveronly/application.json
@@ -1,7 +1,7 @@
 [
     {
         "settings": [ "master" ],
-		"appPort": 4083,
+		"appPort": 8666,
 		"YouCanSeeMe": {
 			"youcanseeme": "itispublic"
 		},

diff --git a/tests/func/applications/frameworkapp/usecase/mojits/Flickr/tests/controller.common-tests.js b/tests/func/applications/frameworkapp/usecase/mojits/Flickr/tests/controller.common-tests.js
diff --git a/tests/func/applications/frameworkapp/usecase/mojits/Flickr/tests/model.common-tests.js b/tests/func/applications/frameworkapp/usecase/mojits/Flickr/tests/model.common-tests.js
diff --git a/...nc/applications/frameworkapp/usecase/mojits/PagedFlickr5/tests/controller.common-tests.js b/...nc/applications/frameworkapp/usecase/mojits/PagedFlickr5/tests/controller.common-tests.js
diff --git a/tests/func/applications/frameworkapp/usecase/mojits/PagedFlickr5/tests/model.common-tests.js b/tests/func/applications/frameworkapp/usecase/mojits/PagedFlickr5/tests/model.common-tests.js
diff --git a/tests/func/applications/frameworkapp/usecase/qetests/suite.json b/tests/func/applications/frameworkapp/usecase/qetests/suite.json
diff --git a/.../func/applications/frameworkapp/usecase/qetests/tests/HelloMojitoTest/hellomojit-tests.js b/.../func/applications/frameworkapp/usecase/qetests/tests/HelloMojitoTest/hellomojit-tests.js