The Model.class now inherits from Base.class

lib/shared/Model.class.js

@@ -5,6 +5,7 @@ var Class = require("alamid-class");
 var Signal = require("alamid-signal");
 var Junction = require("alamid-junction");
 var EventEmitter = Class(require("events").EventEmitter);
+var Base = require("./Base.class.js");
 var modelStatics = require("./modelStatics.js");
 var _ = require("underscore");
 var log = require("./logger.js").get("shared");
@@ -25,10 +26,10 @@ var slice = Array.prototype.slice;
 
 /**
  * @class Model
- * @extends EventEmitter
+ * @extends Base
  * @mixins Junction
  */
-var Model = EventEmitter.extend("Model", Junction, {
+var Model = Base.extend("Model", Junction, {
     /**
      * Sets alamid-signal as Signal-class that will be used by alamid-junction
      */
@@ -900,8 +901,8 @@ var Model = EventEmitter.extend("Model", Junction, {
      */
     dispose: function () {
         Junction.prototype.dispose.call(this);
-        this.emit("dispose", new DisposeEvent(this));
-        this.removeAllListeners();
+
+        this._super();
 
         // clearing references
         this._ids = null;

test/shared/Model.class.test.js

@@ -839,13 +839,10 @@ describe("Model", function () {
             });
 
             it("should remove all event listeners", function () {
-                var hasBeenCalled = false;
-
-                user.removeAllListeners = function () {
-                   hasBeenCalled = true;
-                };
+                user.on("some-event", function () {});
+                expect(Object.keys(user._events)).to.have.length(1);
                 user.dispose();
-                expect(hasBeenCalled).to.equal(true);
+                expect(Object.keys(user._events)).to.have.length(0);
             });
 
             it("should set the isDisposed-flag on true", function () {