Skip to content

Commit

Permalink
fixed issue with UMD
Browse files Browse the repository at this point in the history
  • Loading branch information
@remojansen
remojansen committed Oct 18, 2015
1 parent 28f4e0a commit e1fc633
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 40 deletions.
4 changes: 2 additions & 2 deletions dist/inversify.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ var gulp = require("gulp"),
browserify = require("browserify"),
source = require("vinyl-source-stream"),
buffer = require("vinyl-buffer"),
run = require("gulp-run"),
tslint = require("gulp-tslint"),
tsc = require("gulp-typescript"),
karma = require("karma").server,
Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"gulp-coveralls": "^0.1.4",
"gulp-docco": "0.0.4",
"gulp-header": "^1.7.1",
"gulp-run": "^1.6.10",
"gulp-tslint": "^3.2.0",
"gulp-typescript": "^2.8.2",
"gulp-uglify": "^1.4.0",
Expand Down
10 changes: 3 additions & 7 deletions source/inversify.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ import { Kernel } from "./kernel";
import { TypeBinding } from "./type_binding";
import { TypeBindingScopeEnum } from "./type_binding_scope";

var inversify = {
Kernel : Kernel,
TypeBinding : TypeBinding,
TypeBindingScopeEnum : TypeBindingScopeEnum
};

export { inversify };
export { Kernel };
export { TypeBinding };
export { TypeBindingScopeEnum };
58 changes: 29 additions & 29 deletions test/inversify.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///<reference path="../typings/tsd.d.ts" />

import { inversify } from "../source/inversify";
import { Kernel, TypeBinding, TypeBindingScopeEnum } from "../source/inversify";
import { Lookup } from "../source/lookup";
var expect = chai.expect;

Expand Down Expand Up @@ -65,27 +65,27 @@ describe("Type Binging Class Test Suite \n", () => {
it('It should set its own properties correctly \n', (done) => {

var runtimeIdentifier = "FooInterface";
var binding = new inversify.TypeBinding<FooInterface>(runtimeIdentifier, Foo);
var binding = new TypeBinding<FooInterface>(runtimeIdentifier, Foo);
expect(binding.runtimeIdentifier).to.equals(runtimeIdentifier);
expect(binding.implementationType).to.not.equals(null);
expect(binding.cache).to.equals(null);
expect(binding.scope).to.equal(inversify.TypeBindingScopeEnum.Transient);
expect(binding.scope).to.equal(TypeBindingScopeEnum.Transient);

var runtimeIdentifier = "BarInterface";
var binding = new inversify.TypeBinding<BarInterface>(
runtimeIdentifier, Bar, inversify.TypeBindingScopeEnum.Singleton);
var binding = new TypeBinding<BarInterface>(
runtimeIdentifier, Bar, TypeBindingScopeEnum.Singleton);

expect(binding.runtimeIdentifier).to.equals(runtimeIdentifier);
expect(binding.implementationType).to.not.equals(null);
expect(binding.cache).to.equals(null);
expect(binding.scope).to.equal(inversify.TypeBindingScopeEnum.Singleton);
expect(binding.scope).to.equal(TypeBindingScopeEnum.Singleton);

done();
});

it("It should be able to use implementationType as a constructor \n", (done) => {
var runtimeIdentifier = "FooInterface";
var binding = new inversify.TypeBinding<FooInterface>(runtimeIdentifier, Foo);
var binding = new TypeBinding<FooInterface>(runtimeIdentifier, Foo);
var instance = new binding.implementationType();
expect(instance.greet()).to.equals("foo");
done();
Expand All @@ -95,7 +95,7 @@ describe("Type Binging Class Test Suite \n", () => {
var runtimeIdentifier = "FooInterface";
var scopeType = 3;
var fn = function() {
new inversify.TypeBinding<FooInterface>(runtimeIdentifier, Foo, scopeType);
new TypeBinding<FooInterface>(runtimeIdentifier, Foo, scopeType);
}
expect(fn).to.throw(`Invalid scope type ${scopeType}`);
done();
Expand All @@ -110,9 +110,9 @@ describe('Kernel Test Suite \n', () => {

it('It should be able to resolve a service without dependencies \n', (done) => {
var expected = new Foo();
var kernel = new inversify.Kernel();
var kernel = new Kernel();
var runtimeIdentifier = "FooInterface";
var binding = new inversify.TypeBinding<FooInterface>(runtimeIdentifier, Foo);
var binding = new TypeBinding<FooInterface>(runtimeIdentifier, Foo);
kernel.bind(binding);
var result = kernel.resolve<FooInterface>(runtimeIdentifier);
expect(expected.name).to.equals(result.name);
Expand All @@ -121,16 +121,16 @@ describe('Kernel Test Suite \n', () => {
});

it('It should be able to resolve a complex dependencies tree \n', (done) => {
var kernel = new inversify.Kernel();
var kernel = new Kernel();
var fooRuntimeIdentifier = "FooInterface";
var barRuntimeIdentifier = "BarInterface";
var fooBarRuntimeIdentifier = "FooBarInterface";

var fooBinding = new inversify.TypeBinding<FooInterface>(fooRuntimeIdentifier, Foo);
var barBinding = new inversify.TypeBinding<BarInterface>(barRuntimeIdentifier, Bar);
var fooBinding = new TypeBinding<FooInterface>(fooRuntimeIdentifier, Foo);
var barBinding = new TypeBinding<BarInterface>(barRuntimeIdentifier, Bar);

var fooBarBinding = new inversify.TypeBinding<FooBarInterface>(
fooBarRuntimeIdentifier, FooBar, inversify.TypeBindingScopeEnum.Singleton);
var fooBarBinding = new TypeBinding<FooBarInterface>(
fooBarRuntimeIdentifier, FooBar, TypeBindingScopeEnum.Singleton);

kernel.bind(fooBinding);
kernel.bind(barBinding);
Expand All @@ -149,11 +149,11 @@ describe('Kernel Test Suite \n', () => {
});

it('It should NOT be able to resolve unbound dependencies \n', (done) => {
var kernel = new inversify.Kernel();
var kernel = new Kernel();
var fooRuntimeIdentifier = "FooInterface";
var barRuntimeIdentifier = "BarInterface";

var barBinding = new inversify.TypeBinding<BarInterface>(barRuntimeIdentifier, Bar);
var barBinding = new TypeBinding<BarInterface>(barRuntimeIdentifier, Bar);
kernel.bind(barBinding);

var foo = kernel.resolve(fooRuntimeIdentifier);
Expand All @@ -164,12 +164,12 @@ describe('Kernel Test Suite \n', () => {
});

it('It should store singleton type bindings in cache \n', (done) => {
var kernel = new inversify.Kernel();
var kernel = new Kernel();
var runtimeIdentifier = "FooInterface";

// Singleton binding
var binding = new inversify.TypeBinding<FooInterface>(
runtimeIdentifier, Foo, inversify.TypeBindingScopeEnum.Singleton);
var binding = new TypeBinding<FooInterface>(
runtimeIdentifier, Foo, TypeBindingScopeEnum.Singleton);

kernel.bind(binding);

Expand All @@ -185,12 +185,12 @@ describe('Kernel Test Suite \n', () => {
});

it('It should unbind a binding when requested \n', (done) => {
var kernel = new inversify.Kernel();
var kernel = new Kernel();
var fooRuntimeIdentifier = "FooInterface";
var barRuntimeIdentifier = "BarInterface";

var fooBinding = new inversify.TypeBinding<FooInterface>(fooRuntimeIdentifier, Foo);
var barBinding = new inversify.TypeBinding<BarInterface>(barRuntimeIdentifier, Bar);
var fooBinding = new TypeBinding<FooInterface>(fooRuntimeIdentifier, Foo);
var barBinding = new TypeBinding<BarInterface>(barRuntimeIdentifier, Bar);
kernel.bind(fooBinding);
kernel.bind(barBinding);

Expand All @@ -209,12 +209,12 @@ describe('Kernel Test Suite \n', () => {
});

it('It should unbind all bindings when requested \n', (done) => {
var kernel = new inversify.Kernel();
var kernel = new Kernel();
var fooRuntimeIdentifier = "FooInterface";
var barRuntimeIdentifier = "BarInterface";

var fooBinding = new inversify.TypeBinding<FooInterface>(fooRuntimeIdentifier, Foo);
var barBinding = new inversify.TypeBinding<BarInterface>(barRuntimeIdentifier, Bar);
var fooBinding = new TypeBinding<FooInterface>(fooRuntimeIdentifier, Foo);
var barBinding = new TypeBinding<BarInterface>(barRuntimeIdentifier, Bar);
kernel.bind(fooBinding);
kernel.bind(barBinding);

Expand All @@ -229,7 +229,7 @@ describe('Kernel Test Suite \n', () => {
});

it('Throw when cannot unbind \n', (done) => {
var kernel = new inversify.Kernel();
var kernel = new Kernel();
var fooRuntimeIdentifier = "FooInterface";

var fn = function() {
Expand All @@ -244,8 +244,8 @@ describe('Kernel Test Suite \n', () => {
// MORE INFO at https://github.com/inversify/InversifyJS/issues/23

// using any to access private members
var kernel : any = new inversify.Kernel();
var binding : any = inversify.TypeBinding;
var kernel : any = new Kernel();
var binding : any = TypeBinding;

var A = function(){};
A.toString = function() { return "class A {\n}"; }
Expand Down

0 comments on commit e1fc633

Please sign in to comment.