Merge pull request #72 from arthurakay/master

Some additional tests
senchalabs · Apr 3, 2014 · c8948b0 · c8948b0
2 parents 72c25a3 + 8f24052
commit c8948b0
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 19 deletions.
diff --git a/app/AppInspector/app.js b/app/AppInspector/app.js
@@ -22,7 +22,8 @@ Ext.Loader.setConfig({
 Ext.application({
 
     requires: [
-        'AI.util.i18n'
+        'AI.util.i18n',
+        'Ext.window.MessageBox'
     ],
     controllers: [
         'Main',

diff --git a/app/AppInspector/app/util/Error.js b/app/AppInspector/app/util/Error.js
@@ -4,10 +4,6 @@
 Ext.define('AI.util.Error', {
     singleton : true,
 
-    requires : [
-        'Ext.window.MessageBox'
-    ],
-
     /**
      * @param {Object} exception
      */

diff --git a/app/AppInspector/metadata/Application b/app/AppInspector/metadata/Application
@@ -15,7 +15,8 @@
         ],
         "name": "AI",
         "requires": [
-            "AI.util.i18n"
+            "AI.util.i18n",
+            "Ext.window.MessageBox"
         ]
     },
     "designerId": "application"

diff --git a/app/test/index.html b/app/test/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <link rel="stylesheet" type="text/css" href="http://sencha.local/_ext/ext-4.2.0/resources/css/ext-all.css">
-        <script type="text/javascript" src="http://sencha.local/_ext/ext-4.2.0/ext-all-debug.js"></script>
+        <link rel="stylesheet" type="text/css" href="http://cdn.sencha.com/ext/gpl/4.2.0/resources/css/ext-all.css">
+        <script type="text/javascript" src="http://cdn.sencha.com/ext/gpl/4.2.0/ext-all-debug.js"></script>
 
         <link rel="stylesheet" type="text/css" href="siesta-2.0.5-lite/resources/css/siesta-all.css">
         <script type="text/javascript" src="siesta-2.0.5-lite/siesta-all.js"></script>

diff --git a/app/test/index.js b/app/test/index.js
@@ -22,14 +22,19 @@ Harness.start(
         ]
     },
 
+    /**
+     * Ext JS 4 and 5 really ought to test the same page for consistency in the tests.
+     * However, Ext JS 5 GA isn't yet available, and for whatever reason the 4.2.1 example throws some console errors (but don't kill the tests)
+     */
     {
         group : 'Ext JS 4',
 
         loaderPath : {
             'AI' : '../AppInspector/app'
         },
 
-        hostPageUrl : 'http://sencha.local/_ext/ext-4.2.1.883/examples/personel-review/index.html',
+        //hostPageUrl : 'http://sencha.local/_ext/ext-4.2.1.883/examples/personel-review/index.html',
+        hostPageUrl : 'http://sencha.local/_ext/ext-4.2.1.883/examples/kitchensink/#basic-panels',
 
         items : [
             'specs/ext4/InspectedWindow.js',
@@ -45,7 +50,7 @@ Harness.start(
             'AI' : '../AppInspector/app'
         },
 
-        hostPageUrl : 'http://sencha.local/_ext/ext-5.0.0.470-pb2/examples/personel-review/index.html',
+        hostPageUrl : 'http://sencha.local/_ext/ext5-qa/ext/examples/kitchensink/#basic-panels',
 
         items : [
             'specs/ext5/InspectedWindow.js',

diff --git a/app/test/specs/ext4/Component.js b/app/test/specs/ext4/Component.js
@@ -31,7 +31,7 @@ StartTest({
         AI.util.Component.getInspectedComponent,
 
         //id of component is specific to the example!
-        'mainviewport',
+        'app-header',
 
         function(data, isException) {
             test.isNot(data.methods, undefined, 'data.methods exists');

diff --git a/app/test/specs/ext4/InspectedWindow.js b/app/test/specs/ext4/InspectedWindow.js
@@ -6,6 +6,10 @@ StartTest({
     ]
 }, function (test) {
 
+    if (!Ext.ux) {
+        Ext.ns('Ext.ux');
+    }
+
     //=================================================================
     test.diag("AI.util.InspectedWindow.getAppVersion()");
     test.is(Ext.ux.AppInspector, undefined, 'Ext.ux.AppInspector is not yet defined.');

diff --git a/app/test/specs/ext4/Store.js b/app/test/specs/ext4/Store.js
@@ -29,7 +29,7 @@ StartTest({
         AI.util.Store.getRecords,
 
         //id of store is specific to the example!
-        [ 'reviewStore', 0 ],
+        [ 'Restaurants', 0 ],
 
         function(data, isException) {
             //test the data object properties

diff --git a/app/test/specs/ext5/Component.js b/app/test/specs/ext5/Component.js
@@ -31,7 +31,7 @@ StartTest({
         AI.util.Component.getInspectedComponent,
 
         //id of component is specific to the example!
-        'mainviewport',
+        'app-header',
 
         function(data, isException) {
             test.isNot(data.methods, undefined, 'data.methods exists');

diff --git a/app/test/specs/ext5/InspectedWindow.js b/app/test/specs/ext5/InspectedWindow.js
@@ -6,6 +6,10 @@ StartTest({
     ]
 }, function (test) {
 
+    if (!Ext.ux) {
+        Ext.ns('Ext.ux');
+    }
+
     //=================================================================
     test.diag("AI.util.InspectedWindow.getAppVersion()");
     test.is(Ext.ux.AppInspector, undefined, 'Ext.ux.AppInspector is not yet defined.');
@@ -18,7 +22,7 @@ StartTest({
             test.isNot(Ext.ux.AppInspector, undefined, 'Ext.ux.AppInspector is defined.');
 
             test.isNot(data.extjs, undefined, 'Framework is Ext JS');
-            test.is(data.extjs, '4.2.1.883', 'Ext JS version is 4.2.1.883');
+            test.is(data.extjs, '5.0.0.700', 'Ext JS version is 5.0.0.700');
         }
     );
 });
diff --git a/app/test/specs/ext5/Store.js b/app/test/specs/ext5/Store.js
@@ -29,7 +29,7 @@ StartTest({
         AI.util.Store.getRecords,
 
         //id of store is specific to the example!
-        [ 'reviewStore', 0 ],
+        [ 'Restaurants', 0 ],
 
         function(data, isException) {
             //test the data object properties
@@ -41,7 +41,7 @@ StartTest({
 
             test.isNot(rec.id, undefined, 'record.id exists');
             test.isNot(rec.modelData, undefined, 'record.modelData exists');
-            test.isNot(rec.rawData, undefined, 'record.rawData exists');
+            test.is(rec.rawData, undefined, 'record.rawData does not exist! (Removed in Ext JS 5)');
         }
     );
 });
diff --git a/app/test/specs/touch/InspectedWindow.js b/app/test/specs/touch/InspectedWindow.js
@@ -6,6 +6,10 @@ StartTest({
     ]
 }, function (test) {
 
+    if (!Ext.ux) {
+        Ext.ns('Ext.ux');
+    }
+
     //=================================================================
     test.diag("AI.util.InspectedWindow.getAppVersion()");
     test.is(Ext.ux.AppInspector, undefined, 'Ext.ux.AppInspector is not yet defined.');
@@ -17,8 +21,8 @@ StartTest({
 
             test.isNot(Ext.ux.AppInspector, undefined, 'Ext.ux.AppInspector is defined.');
 
-            test.isNot(data.extjs, undefined, 'Framework is Ext JS');
-            test.is(data.extjs, '4.2.1.883', 'Ext JS version is 4.2.1.883');
+            test.isNot(data.touch, undefined, 'Framework is Touch');
+            test.is(data.touch, '2.3.1', 'Touch version is 2.3.1');
         }
     );
 });
diff --git a/app/test/specs/touch/Store.js b/app/test/specs/touch/Store.js
@@ -29,7 +29,7 @@ StartTest({
         AI.util.Store.getRecords,
 
         //id of store is specific to the example!
-        [ 'List', 0 ],
+        [ 'ext-data-store-1', 0 ],
 
         function(data, isException) {
             //test the data object properties