Merge pull request #30 from Spy-Seth/fix/mock-service

Always expose the container `mockService` method

Author: armandabric

.travis.yml

@@ -3,17 +3,15 @@ language: node_js
 sudo: false
 
 node_js:
-    - "5.7"
-    - "5.6"
-    - "5.5"
-    - "5.4"
-    - "5.3"
-    - "5.2"
-    - "5.1"
-    - "5.0"
-    - "4.3"
-    - "4.2"
+    # Current
+    - "6.1"
+    - "6.0"
+    - "5.9"
+    # LTS
+    - "4.4"
+    # Maintenance
     - "0.12"
+    - "0.10"
 
 script:
     - npm test

src/Container.js

@@ -69,25 +69,24 @@ Container.prototype.getService = function (name) {
     return serviceInstance;
 };
 
-if (process.env.NODE_ENV === 'test') {
-    /**
-     * Replace a service instance by a mocked instance. Only avialable in test environement.
-     *
-     * @param {String} name
-     * @param {Function} mock
-     */
-    Container.prototype.mockService = function (name, mock) {
-        if (!this.serviceDefinitionCollection.hasServiceDefinition(name)) {
-            throw new Error('Unknown service "' + name + '".');
-        }
-
-        if (!this.serviceStorage.hasInstance(name)) {
-            this.serviceStorage.addInstance(name, mock);
-            return;
-        }
-
-        this.serviceStorage.replaceInstance(name, mock);
-    };
-}
+/**
+ * Replace a service instance by a mocked instance. Should only be used in test
+ * environement.
+ *
+ * @param {String} name
+ * @param {Function} mock
+ */
+Container.prototype.mockService = function (name, mock) {
+    if (!this.serviceDefinitionCollection.hasServiceDefinition(name)) {
+        throw new Error('Unknown service "' + name + '".');
+    }
+
+    if (!this.serviceStorage.hasInstance(name)) {
+        this.serviceStorage.addInstance(name, mock);
+        return;
+    }
+
+    this.serviceStorage.replaceInstance(name, mock);
+};
 
 module.exports = Container;

tests/units/ContainerSpec.js

@@ -13,16 +13,6 @@ describe('Container', function () {
         process.env.NODE_ENV = previousProcessEnv;
     });
 
-    /**
-     * @see http://stackoverflow.com/a/16060619
-     * @param {[type]} module
-     * @return {[type]}
-     */
-    function requireUncached(module) {
-        delete require.cache[require.resolve(module)]
-        return require(module)
-    }
-
     it('should throw a error when trying to mock an undefined service', function () {
         var serviceDefinitionCollection = sinon.createStubInstance(ServiceDefinitionCollection);
         var parameterCollection = sinon.createStubInstance(ParameterCollection);
@@ -34,28 +24,6 @@ describe('Container', function () {
         }).to.throw('Unknown service "foo".');
     });
 
-    it('should provide an api to mock a service in test environement', function () {
-        var serviceDefinitionCollection = sinon.createStubInstance(ServiceDefinitionCollection);
-        var parameterCollection = sinon.createStubInstance(ParameterCollection);
-
-        process.env.NODE_ENV = 'test';
-        var FreshContainer = requireUncached('./../../src/Container');
-
-        var container = new FreshContainer(serviceDefinitionCollection, parameterCollection);
-        expect(container).to.have.property('mockService');
-    });
-
-    it('should not provide an api to mock a service in production environement', function () {
-        var serviceDefinitionCollection = sinon.createStubInstance(ServiceDefinitionCollection);
-        var parameterCollection = sinon.createStubInstance(ParameterCollection);
-
-        process.env.NODE_ENV = 'production';
-        var FreshContainer = requireUncached('./../../src/Container');
-
-        var container = new FreshContainer(serviceDefinitionCollection, parameterCollection);
-        expect(container).to.not.have.property('mockService');
-    });
-
     it('should check the service cyclic dependencies if the container validation activated', function () {
         var serviceDefinitionCollection = sinon.createStubInstance(ServiceDefinitionCollection);
         serviceDefinitionCollection.checkCyclicDependencies.returns(null);