Merge remote-tracking branch 'timblinkbox/angular.js/update1.0.1'

Author: chrismilleruk

Rakefile

@@ -237,7 +237,7 @@ end
 ##
 # generates css snippet from a given files and optionally applies simple minification rules
 #
-def gen_css(cssFile, minify = false)
+def gen_css(cssFile, minify = true)
   css = ''
   File.open(cssFile, 'r') do |f|
     css = f.read

css/angular-scenario.css

@@ -195,6 +195,12 @@ body {
   background-color: #efefef;
 }
 
+#specs .description {
+	background-color: #EFEFEF; 
+	padding-left: 20px; 
+	font-style: italic;
+}
+
 #application {
   border: 1px solid #BABAD1;
 }

src/ngScenario/Describe.js

@@ -6,14 +6,16 @@
  *
  * @param {string} descName Name of the block
  * @param {Object} parent describe or undefined if the root.
+ * @param {string} descDescription Description of the block
  */
-angular.scenario.Describe = function(descName, parent) {
+angular.scenario.Describe = function(descName, parent, descDescription) {
   this.only = parent && parent.only;
   this.beforeEachFns = [];
   this.afterEachFns = [];
   this.its = [];
   this.children = [];
   this.name = descName;
+  this.description = descDescription;
   this.parent = parent;
   this.id = angular.scenario.Describe.id++;
 
@@ -65,9 +67,10 @@ angular.scenario.Describe.prototype.afterEach = function(body) {
  *
  * @param {string} name Name of the block. Appended to the parent block's name.
  * @param {function()} body Body of the block.
+ * @param {string} description Description of the block. Appended to the parent block's name.
  */
-angular.scenario.Describe.prototype.describe = function(name, body) {
-  var child = new angular.scenario.Describe(name, this);
+angular.scenario.Describe.prototype.describe = function(name, body, description) {
+  var child = new angular.scenario.Describe(name, this, description);
   this.children.push(child);
   body.call(child);
 };

src/ngScenario/Runner.js

@@ -12,10 +12,11 @@ angular.scenario.Runner = function($window) {
   this.rootDescribe = new angular.scenario.Describe();
   this.currentDescribe = this.rootDescribe;
   this.api = {
-    it: this.it,
+    it: this.it,	
     iit: this.iit,
     xit: angular.noop,
     describe: this.describe,
+	describeStart: this.describeStart,
     ddescribe: this.ddescribe,
     xdescribe: angular.noop,
     beforeEach: this.beforeEach,
@@ -76,6 +77,27 @@ angular.scenario.Runner.prototype.describe = function(name, body) {
   });
 };
 
+/**
+ * Defines a describe block of a spec, but allows the body to callback when the describe has been processed.
+ *
+ * @see Describe.js
+ *
+ * @param {string} name Name of the block
+ * @param {function()} body Body of the block
+ * @param {string} description Description of the block
+ */
+angular.scenario.Runner.prototype.describeStart = function(name, body, description) {
+  var self = this;
+  this.currentDescribe.describe(name, function() {
+    var parentDescribe = self.currentDescribe;
+    var endDescribeCallback = function() {self.currentDescribe = parentDescribe;};
+	
+	self.currentDescribe = this;	
+	body.call(this, endDescribeCallback);    
+  }, 
+  description);
+};
+
 /**
  * Same as describe, but makes ddescribe the only blocks to run.
  *

src/ngScenario/output/Html.js

@@ -133,11 +133,20 @@ angular.scenario.output('html', function(context, runner, model) {
         currentContext.find('> .test-children').append(
           '<div class="test-describe" id="' + id + '">' +
           '  <h2></h2>' +
+		  '  <div class="description" style="display: none;"></div>' +
           '  <div class="test-children"></div>' +
           '  <ul class="tests"></ul>' +
           '</div>'
         );
-        context.find('#' + id).find('> h2').text('describe: ' + defn.name);
+        context.find('#' + id).find('> h2').text(defn.name);
+		
+		// Add the description if it exists
+		if(!!defn.description)
+        {
+            var $description = context.find('#' + id).find('> .description');
+            $description.text(defn.description);
+            $description.show();
+        }
       }
       currentContext = context.find('#' + id);
     });