convention rework

10 files changed, 24 insertions, 24 deletions

diff --git a/test/helper.js b/test/helper.js
index 12f21a6..5b7f178 100644
--- a/test/helper.js
+++ b/test/helper.js
@@ -66,11 +66,11 @@
     });
   };
 
-  testSupport.requireLib = function(lib, callback) {
+  testSupport.lib = function(lib, callback) {
      testSupport.require('/lib/webcals/' + lib, callback);
   };
 
-  testSupport.requireSupport = function(lib) {
+  testSupport.helper = function(lib) {
     testSupport.require('/test/support/' + lib);
   }
 
@@ -90,11 +90,11 @@
   }
 
   requireRequest = function(callback) {
-    testSupport.requireLib('xhr');
-    testSupport.requireLib('sax');
-    testSupport.requireLib('request/abstract');
-    testSupport.requireLib('template');
-    testSupport.requireSupport('fake_xhr');
+    testSupport.lib('xhr');
+    testSupport.lib('sax');
+    testSupport.lib('request/abstract');
+    testSupport.lib('template');
+    testSupport.helper('fake_xhr');
 
     //in the future we need a callback for browser support.
     if (typeof(callback) !== 'undefined') {
diff --git a/test/webcals/ical_test.js b/test/webcals/ical_test.js
index ff589b6..3ff1dc3 100644
--- a/test/webcals/ical_test.js
+++ b/test/webcals/ical_test.js
@@ -1,4 +1,4 @@
-testSupport.requireLib('ical'),
+testSupport.lib('ical'),
 
 suite('webcals/ics', function() {
 
diff --git a/test/webcals/request/calendar_query_test.js b/test/webcals/request/calendar_query_test.js
index d896b43..4b2e556 100644
--- a/test/webcals/request/calendar_query_test.js
+++ b/test/webcals/request/calendar_query_test.js
@@ -1,6 +1,6 @@
 requireRequest();
-testSupport.requireLib('request/propfind');
-testSupport.requireLib('request/calendar_query');
+testSupport.lib('request/propfind');
+testSupport.lib('request/calendar_query');
 
 suite('webcals/request/calendar_query', function() {
   var Propfind,
diff --git a/test/webcals/sax/base_test.js b/test/webcals/sax/base_test.js
index 63d7103..cdd8379 100644
--- a/test/webcals/sax/base_test.js
+++ b/test/webcals/sax/base_test.js
@@ -1,5 +1,5 @@
-testSupport.requireLib('sax');
-testSupport.requireLib('sax/base');
+testSupport.lib('sax');
+testSupport.lib('sax/base');
 
 suite('webcals/sax/base', function() {
 
diff --git a/test/webcals/sax/dav_response_test.js b/test/webcals/sax/dav_response_test.js
index a3e3d2b..70d1c0b 100644
--- a/test/webcals/sax/dav_response_test.js
+++ b/test/webcals/sax/dav_response_test.js
@@ -1,7 +1,7 @@
-testSupport.requireLib('sax');
-testSupport.requireLib('sax/base');
-testSupport.requireLib('sax/dav_response');
-testSupport.requireLib('ical');
+testSupport.lib('sax');
+testSupport.lib('sax/base');
+testSupport.lib('sax/dav_response');
+testSupport.lib('ical');
 
 suite('webcals/sax/dav_response', function() {
 
diff --git a/test/webcals/sax_test.js b/test/webcals/sax_test.js
index 75ff496..7924c0a 100644
--- a/test/webcals/sax_test.js
+++ b/test/webcals/sax_test.js
@@ -1,5 +1,5 @@
-testSupport.requireLib('sax');
-testSupport.requireLib('sax/base');
+testSupport.lib('sax');
+testSupport.lib('sax/base');
 
 suite('webcals/sax', function() {
 
diff --git a/test/webcals/template_test.js b/test/webcals/template_test.js
index a59fc9c..75ccb6a 100644
--- a/test/webcals/template_test.js
+++ b/test/webcals/template_test.js
@@ -1,4 +1,4 @@
-testSupport.requireLib('template');
+testSupport.lib('template');
 
 suite('templates', function() {
 
diff --git a/test/webcals/templates/calendar_data_test.js b/test/webcals/templates/calendar_data_test.js
index 290b012..64b6b57 100644
--- a/test/webcals/templates/calendar_data_test.js
+++ b/test/webcals/templates/calendar_data_test.js
@@ -1,5 +1,5 @@
 requireRequest();
-testSupport.requireLib('templates/calendar_data');
+testSupport.lib('templates/calendar_data');
 
 suite('webcals/templates/calendar_data', function() {
   var CalendarData;
diff --git a/test/webcals/templates/calendar_filter_test.js b/test/webcals/templates/calendar_filter_test.js
index be8d133..8173569 100644
--- a/test/webcals/templates/calendar_filter_test.js
+++ b/test/webcals/templates/calendar_filter_test.js
@@ -1,6 +1,6 @@
 requireRequest();
-testSupport.requireLib('templates/calendar_data');
-testSupport.requireLib('templates/calendar_filter');
+testSupport.lib('templates/calendar_data');
+testSupport.lib('templates/calendar_filter');
 
 suite('webcals/templates/calendar_filter', function() {
   var CalendarFilter;
diff --git a/test/webcals/xhr_test.js b/test/webcals/xhr_test.js
index 75504f0..1baa7b9 100644
--- a/test/webcals/xhr_test.js
+++ b/test/webcals/xhr_test.js
@@ -1,5 +1,5 @@
-testSupport.requireLib('xhr');
-testSupport.requireSupport('fake_xhr');
+testSupport.lib('xhr');
+testSupport.helper('fake_xhr');
 
 suite('webacls/xhr', function() {
   var subject,