fix(apimock): correctly detect URL commands

Fixes #37
seriema · Sep 13, 2015 · ccf22f2 · ccf22f2
1 parent 4719f42
commit ccf22f2
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 22 deletions.
diff --git a/app/index.html b/app/index.html
@@ -33,7 +33,7 @@ <h2>Debug info</h2>
 
 			app.config(function (apiMockProvider) {
 				apiMockProvider.config({
-					mockDataPath: 'mock_data',
+					mockDataPath: '/mock_data',
 					apiPath: '/api'
 				});
 			});

diff --git a/app/scripts/angular-apimock.js b/app/scripts/angular-apimock.js
@@ -171,27 +171,18 @@ angular.module('apiMock', [])
 		}
 
 		function getCommand(mockValue) {
-			switch (typeof mockValue) {
-				case 'number':
-					if (mockValue !== 0 && !isNaN(mockValue)) {
-						return { type: 'respond', value: mockValue };
-					}
-					break;
-
-				case 'string':
-					switch(mockValue.toLowerCase()) {
-						case 'auto':
-							return { type: 'recover' };
-						case 'true':
-							return { type: 'reroute' };
-					}
-					break;
-
-				case 'boolean':
-					if (mockValue === true) {
-						return { type: 'reroute' };
-					}
-					break;
+			// Depending how we got mockValue it might've been parsed into a type or not.
+			switch ((mockValue || '').toString().toLowerCase()) {
+				case '200':
+				case '404':
+				case '500':
+					return { type: 'respond', value: parseInt(mockValue, 10) };
+
+				case 'auto':
+					return { type: 'recover' };
+
+				case 'true':
+					return { type: 'reroute' };
 			}
 
 			return { type: 'ignore' };

diff --git a/test/spec/services/angular-apimock.js b/test/spec/services/angular-apimock.js
@@ -151,6 +151,36 @@ describe('Service: apiMock', function () {
 					});
 				});
 
+				it('should detect HTTP verb command as string', function () {
+					$location.url('/page?apiMock=200');
+
+					// Cannot use $httpBackend.expect() because HTTP status doesn't do a request
+					$http(defaultRequest)
+						.success(fail)
+						.error(function(data, status) {
+							expect(apiMock._countFallbacks()).toEqual(0);
+							expect(status).toEqual(200);
+						});
+
+					$rootScope.$digest();
+					$timeout.flush();
+				});
+
+				it('should detect HTTP verb command as number', function () {
+					$location.search('apimock', 200);
+
+					// Cannot use $httpBackend.expect() because HTTP status doesn't do a request
+					$http(defaultRequest)
+						.success(fail)
+						.error(function(data, status) {
+							expect(apiMock._countFallbacks()).toEqual(0);
+							expect(status).toEqual(200);
+						});
+
+					$rootScope.$digest();
+					$timeout.flush();
+				});
+
 				it('should detect in search queries', function () {
 					$location.url('/page?apiMock=true');