prepare-server-get-component-parameters

client/src/get-components-data.js

@@ -62,7 +62,7 @@ module.exports = function(config){
 
   var performGet = function(endpoint, serverRendering, options, callback) {
     var component = serverRendering.components[0];
-    var requestUrl = hrefBuilder.prepareServerGet(endpoint, component, options); 
+    var requestUrl = hrefBuilder.prepareServerGet(endpoint, component); 
 
     var requestDetails = {
       url: requestUrl,

client/src/href-builder.js

@@ -50,9 +50,9 @@ module.exports = function(config){
       }
     },
 
-    prepareServerGet: function(baseUrl, component, options) {
+    prepareServerGet: function(baseUrl, component) {
       var urlPath = component.name + (component.version ? '/' + component.version : '');
-      var qs = options.parameters ? ('/?' + querystring.stringify(options.parameters)) : '';
+      var qs = component.parameters ? ('/?' + querystring.stringify(component.parameters)) : '';
 
       return url.resolve(baseUrl, urlPath + qs);
     }

package.json

@@ -7,7 +7,8 @@
     "oc": "./src/oc-cli.js"
   },
   "scripts": {
-    "test": "grunt test"
+    "test": "grunt test",
+    "test:unit": "mocha test/unit"
   },
   "engines": {
     "node": ">=4"

test/unit/client-get-component-data.js

@@ -37,7 +37,8 @@ describe('client : get-component-data', () => {
 
       const component = {
         name: 'hello-world',
-        version: '1.0.0'
+        version: '1.0.0',
+        parameters: options.parameters
       };
 
       getComponentData([{
@@ -54,7 +55,7 @@ describe('client : get-component-data', () => {
     it('href-builder prepareServerGet method is invoked', () => {
       sinon.assert.calledOnce(serverStub);
       sinon.assert.calledOnce(prepareServerGetStub);
-      sinon.assert.calledWith(prepareServerGetStub, baseUrl, {name: 'hello-world', version: '1.0.0'}, options);
+      sinon.assert.calledWith(prepareServerGetStub, baseUrl, { name: 'hello-world', version: '1.0.0', parameters: options.parameters });
     });
 
     it('a GET request is made with the URL returned by href-builder.prepareServerGet method', () => {

test/unit/client-href-builder.js

@@ -40,22 +40,20 @@ describe('client : href-builder :', () => {
 
     describe('when there is one component parameter set in the options', () => {
       it('it should return a valid request for the component with the parameter set as URL query param', () => {
-        let options = {parameters: {p1: 'v1'}};
-        let component = {name: 'hello-world', version: '1.0.0'};
+        let component = { name: 'hello-world', version: '1.0.0', parameters: { p1: 'v1' } };
         let hrefBuilder = new hrefBuilderPrototype({});
 
-        expect(hrefBuilder.prepareServerGet('http://localhost:3030', component, options))
+        expect(hrefBuilder.prepareServerGet('http://localhost:3030', component))
             .to.equal('http://localhost:3030/hello-world/1.0.0/?p1=v1');
       });
     });
 
     describe('when there are more than one component parameters set in the options', () => {
       it('it should return a valid request for the component with the parameters set as URL query params', () => {
-        let options = {parameters: {p1: 'v1', p2: 'v 2'}};
-        let component = {name: 'hello-world', version: '1.0.0'};
+        let component = { name: 'hello-world', version: '1.0.0', parameters: { p1: 'v1', p2: 'v 2' } };
         let hrefBuilder = new hrefBuilderPrototype({});
 
-        expect(hrefBuilder.prepareServerGet('http://localhost:3030', component, options))
+        expect(hrefBuilder.prepareServerGet('http://localhost:3030', component))
             .to.equal('http://localhost:3030/hello-world/1.0.0/?p1=v1&p2=v%202');
       });
     });