aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMisko Hevery2010-01-18 10:47:03 -0800
committerMisko Hevery2010-01-18 10:47:03 -0800
commit595b4ea097bcb512173b6d4a12924ea1a3d70ecd (patch)
tree24a85ee2ab41d6eb16661cf4d55443954c6c62c0 /test
parent27709c3f69384a7630aa336a1e73e730ea5f9790 (diff)
downloadangular.js-595b4ea097bcb512173b6d4a12924ea1a3d70ecd.tar.bz2
checkpoint for integration with angular
Diffstat (limited to 'test')
-rw-r--r--test/AngularTest.js (renamed from test/LoaderTest.js)20
-rw-r--r--test/testabilityPatch.js2
2 files changed, 6 insertions, 16 deletions
diff --git a/test/LoaderTest.js b/test/AngularTest.js
index a474c8a4..9610ef76 100644
--- a/test/LoaderTest.js
+++ b/test/AngularTest.js
@@ -1,25 +1,15 @@
-LoaderTest = TestCase('LoaderTest');
+AngularTest = TestCase('AngularTest');
-LoaderTest.prototype.testLoadCss = function(){
- if ($.browser.safari) return;
- var head = jQuery('<head/>')[0];
- var loader = new Loader(document, head, {});
- var log = '';
- loader.config.server = 'http://';
- loader.loadCss('x');
- assertEquals($(head).find('link').attr('href'), 'http://x');
-};
-
-LoaderTest.prototype.testDefaultDatabasePathFromSubdomain = function() {
- var loader = new Loader(null, null, {server:"http://account.getangular.com", database:"database"});
+AngularTest.prototype.testDefaultDatabasePathFromSubdomain = function() {
+ var loader = new Angular(null, null, {server:"http://account.getangular.com", database:"database"});
loader.computeConfiguration();
assertEquals("database", loader.config.database);
- loader = new Loader(null, null, {server:"http://account.getangular.com"});
+ loader = new Angular(null, null, {server:"http://account.getangular.com"});
loader.computeConfiguration();
assertEquals("account", loader.config.database);
- loader = new Loader(null, null, {server:"https://account.getangular.com"});
+ loader = new Angular(null, null, {server:"https://account.getangular.com"});
loader.computeConfiguration();
assertEquals("account", loader.config.database);
};
diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index dde21846..78ffd380 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -96,7 +96,7 @@ function decode64(base64){
return fromJson(Base64.decode(base64));
}
-Loader.prototype.configureJQueryPlugins();
+Angular.prototype.configureJQueryPlugins();
function assertHidden(node) {
var display = node.css('display');