Test Modules: Update testing of module properties, fix error response in Github

Author: MrSwitch

src/modules/github.js

@@ -8,7 +8,7 @@ function formatError(o,code){
 	if( (code===401||code===403) ){
 		o.error = {
 			code : "access_denied",
-			message : o.message
+			message : o.message || (o.data?o.data.message:"Could not get response")
 		};
 		delete o.message;
 	}

tests/karma.conf.js

@@ -18,7 +18,8 @@ module.exports = function (karma) {
 
 // list of files to exclude
         exclude: [
-            'karma.conf.js'
+            'karma.conf.js',
+            '../src/temp/*.js'
         ],
 
 

tests/test-modules.js

@@ -3,65 +3,59 @@
 //
 // Modules are of the following formats
 //
-describe('Modules all', function(){
 
-	var MATCH_URL = /^https?\:\/\//;
+// Loop through all services
+for(var name in hello.services){
+	setup_module_tests(hello.services[name], name);
+}
 
-	it('contain oauth or url.auth paths', function(){
+function setup_module_tests(module, name){
 
-		// Loop through all services
-		for(var name in hello.services){
-			var path = hello.services[name].oauth.auth;
+	describe( module.name || name + ' Module', function(){
+
+		var MATCH_URL = /^https?\:\/\//;
+
+		it('contain oauth.auth path', function(){
+			var path = module.oauth.auth;
 			expect( path ).to.match( /^https?\:\/\// );
-		}
-	});
+		});
+
+		it('specify a base url', function(){
+			// Loop through all services
+			expect( module.base ).to.match( /^https?\:\/\// );
+		});
 
 
-	it('using OAuth1 contain, auth, request, token properties', function(){
+		it('using OAuth1 contain, auth, request, token properties', function(){
 
-		// Loop through all services
-		for(var name in hello.services){
-			var oauth = hello.services[name].oauth;
+			// Loop through all services
+			var oauth = module.oauth;
 			if(oauth && parseInt(oauth.version,10) === 1 ){
 				expect( oauth.auth ).to.match( MATCH_URL );
 				expect( oauth.token ).to.match( MATCH_URL );
 				expect( oauth.request ).to.match( MATCH_URL );
 			}
-		}
-	});
-
-	it('return error object when an api request is made with an unverified user', function(done){
-
-		this.timeout(60000);
-
-		var i=0;
+		});
 
-		function contains_error_callback(data){
+		it('return error object when an api request is made with an unverified user', function(done){
 
-			expect(data).to.be.a("object");
-			expect(data).to.have.property("error");
-			expect(data.error).to.have.property("code");
-			expect(data.error).to.have.property("message");
-			expect(data.error.code).to.not.be.an("object");
-			expect(data.error.message).to.not.be.an("object");
-
-			if(--i <= 0){
-				done();
-			}
-		}
-
-		// Loop through all services
-		for(var name in hello.services){
-			// i++
-			i++;
+			this.timeout(60000);
 
 			// ensure user is signed out
 			hello.logout(name);
 
 			// Make a request that returns an error object
-			hello(name).api('me', contains_error_callback);
-		}
-	});
-	/**/
+			hello(name).api('me', function(data){
+				expect(data).to.be.a("object");
+				expect(data).to.have.property("error");
+				expect(data.error).to.have.property("code");
+				expect(data.error).to.have.property("message");
+				expect(data.error.code).to.not.be.an("object");
+				expect(data.error.message).to.not.be.an("object");
+				done();
+			});
+		});
+		/**/
 
-});
+	});
+}