#! The bind method use previous binded alias entry

seznam · Dec 2, 2016 · 51adf1a · 51adf1a
1 parent 8a94a25
commit 51adf1a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/ObjectContainer.js b/ObjectContainer.js
@@ -139,12 +139,14 @@ export default class ObjectContainer {
 		}
 
 		let classConstructorEntry = this._entries.get(classConstructor);
+		let nameEntry = this._entries.get(name);
+		let entry = classConstructorEntry || nameEntry;
 
-		if (classConstructorEntry) {
-			this._entries.set(name, classConstructorEntry);
+		if (entry) {
+			this._entries.set(name, entry);
 
 			if (dependencies) {
-				this._updateEntryValues(classConstructorEntry, classConstructor, dependencies);
+				this._updateEntryValues(entry, classConstructor, dependencies);
 			}
 
 		} else {

diff --git a/__tests__/ObjectContainerSpec.js b/__tests__/ObjectContainerSpec.js
@@ -202,6 +202,26 @@ describe('ima.ObjectContainer', function() {
 			expect(oc._entries.get(alias)).toEqual(oc._entries.get(classParent));
 		});
 
+		it('should use entry from entries which was provided and binded', function() {
+			oc.provide(classParent, classConstructor, dependencies);
+			oc.bind(alias, classParent);
+			var aliasEntry = oc._entries.get(alias);
+
+			spyOn(oc, '_updateEntryValues')
+				.and
+				.callThrough();
+
+			oc.bind(alias, classConstructorWithDependencies, classConstructorWithDependencies.$dependencies);
+
+			expect(oc._updateEntryValues).toHaveBeenCalledWith(
+				aliasEntry,
+				classConstructorWithDependencies,
+				classConstructorWithDependencies.$dependencies
+			);
+			expect(aliasEntry.classConstructor).toEqual(classConstructorWithDependencies);
+			expect(aliasEntry.dependencies).toEqual(classConstructorWithDependencies.$dependencies);
+		});
+
 	});
 
 	describe('provide method', function() {