Add 'Post' request method tests.

PabloVallejo · May 1, 2014 · 5968e55 · 5968e55
1 parent 1e30383
commit 5968e55
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -9,7 +9,7 @@
   "authors": [
     "Pablo Vallejo <[email protected]>"
   ],
-  "description": "Lightweight JavaScript framework inspired in Backbone",
+  "description": "Lightweight JavaScript MVC framework inspired in Backbone",
   "keywords": [
     "javascript",
     "framework",

diff --git a/gillie.js b/gillie.js
@@ -12,7 +12,7 @@
     var
 
         // Gillie version
-        version = '0.2.0'
+        version = '0.2.1'
 
     ,   initializing = false
     ,   fnTest = /xyz/.test( function(){ xyz; }) ? /\b_super\b/ : /.*/
@@ -307,8 +307,7 @@
                     return optional ? match : modelVar || match;
                 });
 
-                // Use `route` as full URL if its contains
-                // `http:|https:`.
+                // Use `route` as full URL if its contains `http:` or `https:`.
                 return (/^(\/\/|http:|https:).*/.test( route )) ?
                    route : ( this.url ? this.url + route :
                        window.location.href + '/' + route );

diff --git a/gillie.min.js b/gillie.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gillie",
   "title": "Gillie",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "JavaScript MVC Microframework",
   "homepage": "http://pablovallejo.github.io/gillie",
   "directories": {

diff --git a/tests/environment.js b/tests/environment.js
@@ -0,0 +1,19 @@
+/**
+ * Test environment setup
+ */
+(function() {
+
+	// Setup config variables on test start
+	QUnit.testStart(function() {
+
+		var env = this.config.current.testEnvironment;
+
+		// Capture Gillie.ajax arguments for comparison.
+		// Adapted from https://github.com/jashkenas/backbone/blob/master/test/environment.js#L23
+		Gillie.ajax = function( settings ) {
+			env.ajaxSettings = settings;
+		}
+
+	});
+
+})();
diff --git a/tests/index.html b/tests/index.html
@@ -8,10 +8,11 @@
         <script src="vendor/qunit.js"></script>
         <script src="vendor/utilities.js"></script>
         <script src="../gillie.js"></script>
+        <script src="environment.js"></script>
         <script src="events.js"></script>
         <script src="handler.js"></script>
-        <script src="model-view-controller.js"></script>
         <script src="inheritance.js"></script>
+        <script src="requests.js"></script>
     </head>
     <body>
 
@@ -22,4 +23,4 @@
 
         </div>
     </div>
-</html>
+</html>
diff --git a/tests/model-view.js b/tests/model-view.js
@@ -1,5 +1,5 @@
 /**
-* General Gillie tests
+* Tests for model and view
 */
 
 $( document ).ready( function() {
@@ -101,7 +101,6 @@ $( document ).ready( function() {
     });
 
 
-
     test( 'Set and unset', 4, function() {
 
         var m = new Gillie.Model({ id: 'id', foo: 1, bar: 2, baz: 3 });

diff --git a/tests/requests.js b/tests/requests.js
@@ -0,0 +1,84 @@
+/**
+ * Request Tests
+ */
+
+$(document).ready(function(){
+
+	// Model
+	var person;
+	Person = Gillie.Model.extend({
+
+		// Base URL
+		url: 'http://myapi.io'
+	});
+
+	// Requests
+	//----------------
+	module('Gillie requests', {
+
+		setup: function() {
+
+			// Create a new person
+			person = new Person({
+				name: 'Fonzie',
+				age: 40
+			});
+		}
+	});
+
+	// Test Model.Post method
+	test( 'Model.Post', function() {
+
+		// Save user
+		person.Post( '/person' );
+
+		// Get data
+		var data = JSON.parse( this.ajaxSettings.data );
+
+		// Test equality
+		equal( this.ajaxSettings.type, 'POST' );
+		equal( this.ajaxSettings.dataType, 'json' );
+		equal( this.ajaxSettings.url, 'http://myapi.io/person' );
+		equal( data.name, person.get( 'name' ) );
+		equal( data.age, person.get( 'age' ) );
+
+	});
+
+	// Test Model.Post passing a complete URL
+	test( 'Model.Post full URL http', function() {
+
+		// Save user
+		person.Post( 'http://otherapi.io/person' );
+
+		// Get data
+		var data = JSON.parse( this.ajaxSettings.data );
+
+		// Test equality
+		equal( this.ajaxSettings.type, 'POST' );
+		equal( this.ajaxSettings.dataType, 'json' );
+		equal( this.ajaxSettings.url, 'http://otherapi.io/person' );
+		equal( data.name, person.get( 'name' ) );
+		equal( data.age, person.get( 'age' ) );
+
+		console.log( this.ajaxSettings );
+
+	});
+
+	// Test Model.Post passing a complete URL
+	test( 'Model.Post full URL https', function() {
+
+		// Save user
+		person.Post( 'https://otherapi.io/person' );
+		equal( this.ajaxSettings.url, 'https://otherapi.io/person' );
+	});
+
+	// Test Model.Post passing a complete URL
+	test( 'Model.Post full URL not https or http', function() {
+
+		// Save user
+		person.Post( 'ttps://otherapi.io/person' );
+		equal( this.ajaxSettings.url, 'http://myapi.iottps://otherapi.io/person' );
+
+	});
+
+});