Added tests for the new url fix

Author: nselvidge

lib/experiment.js

@@ -132,18 +132,18 @@ Experiment.prototype.saveAttributes = function() {
     .attributes);
 }
 
-Experiment.prototype.getOptcliUrl = function() {
-  var optcliUrl;
-  var appendToUrl;
-  optcliUrl = this.attributes.edit_url;
-  optcliUrl.indexOf('?') === -1 ? 
-    appendToUrl = '?optcli=activate' : 
-    appendToUrl = '&optcli=activate';
-  optcliUrl.indexOf('#') === -1 ?
-    optcliUrl += appendToUrl :
-    optcliUrl = optcliUrl.replace('#', appendToUrl + '#');
-
-  return optcliUrl;
+Experiment.prototype.getOptcliURL = function() {
+  var optcliURL;
+  var appendToURL;
+  optcliURL = this.attributes.edit_url;
+  optcliURL.indexOf('?') === -1 ? 
+    appendToURL = '?optcli=activate' : 
+    appendToURL = '&optcli=activate';
+  optcliURL.indexOf('#') === -1 ?
+    optcliURL += appendToURL :
+    optcliURL = optcliURL.replace('#', appendToURL + '#');
+
+  return optcliURL;
 }
 
 module.exports = Experiment;

lib/server/controller.js

@@ -36,7 +36,7 @@ function LocalController(variation, port) {
 
   this.locals = {
     _port: this.port,
-    edit_url: this.experiment.getOptcliUrl(),
+    edit_url: this.experiment.getOptcliURL(),
     experiment_desc: this.experiment.attributes.description,
     variation_desc: this.variation.attributes.description
   }

test/commands/push-variation.test.js

@@ -22,7 +22,7 @@ var directory = {};
 
 var pushVariation = proxyquire('../../lib/commands/push-variation', { 'optimizely-node-client': ClientStub });
 
-describe('Push Experiment Module', function() {
+describe('Push Variation Module', function() {
   before(function(done) {
     //Create temporary project directory and enter it
     quickTemp.makeOrRemake(directory, 'project');

test/experiment.test.js

@@ -58,7 +58,7 @@ describe('Experiment Object', function (){
     });
   });
   after(function(done){
-    quickTemp.remove(directories, 'experiment');
+    quickTemp.remove(directories, 'project');
     done();
   })
   describe('#create()', function() {
@@ -204,4 +204,38 @@ describe('Experiment Object', function (){
       expect(functionCalls[0][0]).to.deep.equal(expArgs);
     });
   });
+  describe('#getOptcliURL()', function(){
+    it('Should put it at the end with an &', function(){
+      var newURL = edit_url + '?myparam=true';
+      var experiment = new Experiment({
+        description: description,
+        edit_url: newURL
+      }, experimentPath+'1');
+      expect(experiment.getOptcliURL()).to.equal(newURL+'&optcli=activate');
+    });
+    it('Should put it at the end with a ?', function(){
+      var newURL = edit_url;
+      var experiment = new Experiment({
+        description: description,
+        edit_url: newURL
+      }, experimentPath+'1');
+      expect(experiment.getOptcliURL()).to.equal(newURL+'?optcli=activate');
+    });
+    it('Should put it before the hash with an &', function(){
+      var newURL = edit_url + '?mygetparam=true#myhashparam=true';
+      var experiment = new Experiment({
+        description: description,
+        edit_url: newURL
+      }, experimentPath+'1');
+      expect(experiment.getOptcliURL()).to.equal(newURL.replace('#','&optcli=activate#'));
+    });
+    it('Should put it before the hash with a ?', function(){
+      var newURL = edit_url + '#myhashparam=true';
+      var experiment = new Experiment({
+        description: description,
+        edit_url: newURL
+      }, experimentPath+'1');
+      expect(experiment.getOptcliURL()).to.equal(newURL.replace('#','?optcli=activate#'));
+    });
+  });
 });

test/mocha.opts

@@ -1 +1 @@
-
+--recursive