Merge branch 'directives' of github.com:angular/angular.js into directives

1 files changed, 5 insertions, 2 deletions

diff --git a/test/directivesSpec.js b/test/directivesSpec.js
index 7504bf6b..ea442d16 100644
--- a/test/directivesSpec.js
+++ b/test/directivesSpec.js
@@ -162,13 +162,16 @@ describe("directives", function(){
       this.greeting = 'hello';
     };
     window.Greeter.prototype = {
+      init: function(){
+       this.suffix = '!';
+      },
       greet: function(name) {
-        return this.greeting + ' ' + name;
+        return this.greeting + ' ' + name + this.suffix;
       }
     };
     var scope = compile('<div ng-controller="Greeter"></div>');
     expect(scope.greeting).toEqual('hello');
-    expect(scope.greet('misko')).toEqual('hello misko');
+    expect(scope.greet('misko')).toEqual('hello misko!');
     delete window.Greeter;
   });
 });