[spec] update specs to cordova.require/define

phonegap · Jun 10, 2013 · 2331218 · 2331218
1 parent 7ec3d47
commit 2331218
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/spec/barcodescanner.tests.js b/spec/barcodescanner.tests.js
@@ -19,35 +19,39 @@
  *
 */
 
-describe('Plugin object (window.plugins)', function () {
+var scanner;
+
+describe('cordova.require object should exist', function () {
 	it("should exist", function() {
-        expect(window.plugins).toBeDefined();
+        expect(window.cordova).toBeDefined();
+        expect(typeof cordova.require == 'function').toBe(true);
 	});
 
-	it("should contain a barcodeScanner object", function() {
-        expect(window.plugins.barcodeScanner).toBeDefined();
-		expect(typeof window.plugins.barcodeScanner == 'object').toBe(true);
+	it("BarcodeScanner plugin should exist", function() {
+        scanner = cordova.require("cordova/plugin/BarcodeScanner")
+        expect(scanner).toBeDefined();
+		expect(typeof scanner == 'object').toBe(true);
 	});
 
     it("should contain a scan function", function() {
-        expect(window.plugins.barcodeScanner.scan).toBeDefined();
-        expect(typeof window.plugins.barcodeScanner.scan == 'function').toBe(true);
+        expect(scanner.scan).toBeDefined();
+        expect(typeof scanner.scan == 'function').toBe(true);
     });
 
     it("should contain an encode function", function() {
-        expect(window.plugins.barcodeScanner.encode).toBeDefined();
-        expect(typeof window.plugins.barcodeScanner.encode == 'function').toBe(true);
+        expect(scanner.encode).toBeDefined();
+        expect(typeof scanner.encode == 'function').toBe(true);
     });
 
     it("should contain three DestinationType constants", function() {
-        expect(BarcodeScanner.Encode.TEXT_TYPE).toBe("TEXT_TYPE");
-        expect(BarcodeScanner.Encode.EMAIL_TYPE).toBe("EMAIL_TYPE");
-        expect(BarcodeScanner.Encode.PHONE_TYPE).toBe("PHONE_TYPE");
-        expect(BarcodeScanner.Encode.SMS_TYPE).toBe("SMS_TYPE");
+        expect(scanner.Encode.TEXT_TYPE).toBe("TEXT_TYPE");
+        expect(scanner.Encode.EMAIL_TYPE).toBe("EMAIL_TYPE");
+        expect(scanner.Encode.PHONE_TYPE).toBe("PHONE_TYPE");
+        expect(scanner.Encode.SMS_TYPE).toBe("SMS_TYPE");
     });
     /*
     it("should call scan successfully", function() {
-        window.plugins.barcodeScanner.scan(function() {}, function() {});
+        scanner.scan(function() {}, function() {});
     });
     */
 });
diff --git a/www/barcodescanner.js b/www/barcodescanner.js
@@ -54,12 +54,12 @@ cordova.define("cordova/plugin/BarcodeScanner",
             }
 
             if (typeof errorCallback != "function") {
-                console.log("BarcodeScanner.scan failure: failure parameter not a function");
+                console.log("BarcodeScanner.encode failure: failure parameter not a function");
                 return
             }
 
             if (typeof successCallback != "function") {
-                console.log("BarcodeScanner.scan failure: success callback parameter must be a function");
+                console.log("BarcodeScanner.encode failure: success callback parameter must be a function");
                 return
             }