Merge pull request #567 from CodeNow/SAN-1001

Change server selection link format

Author: tjmehta

templates/github_pull_request_choose_server.hbs

@@ -1 +1 @@
-[Choose a server](http://{{domain}}/{{owner.login}}/boxSelection/{{repoName}}/{{encode branch}}/{{encode headCommit.message}}/{{commit}}?source=pr) to run PR-{{number}}.
+[Choose a server](http://{{domain}}/{{owner.login}}/serverSelection/{{repoName}}?branch={{encode branch}}&message={{encode headCommit.message}}&commit={{commit}}&source=pr) to run PR-{{number}}.

templates/hipchat_on_build.hbs

@@ -1,2 +1,2 @@
 {{user.login}}'s <a href="{{wrapGitHubLink headCommit.url}}">changes</a> ({{commitMessage headCommit.message}}{{{moreChangesHipchat repo commitLog}}}) to {{repo}} ({{branch}}) are ready.
-<a href="http://{{domain}}/{{owner.login}}/boxSelection/{{repoName}}/{{encode branch}}/{{encode headCommit.message}}/{{headCommit.id}}">Choose a server to run {{branch}}</a>.
+<a href="http://{{domain}}/{{owner.login}}/serverSelection/{{repoName}}?branch={{encode branch}}&message={{encode headCommit.message}}&commit={{headCommit.id}}">Choose a server to run {{branch}}</a>.

templates/slack_on_build.hbs

@@ -1,2 +1,2 @@
 {{user.login}}'s <{{wrapGitHubLink headCommit.url}}|changes> ({{{slackCommitMessage headCommit.message}}}{{{moreChangesSlack repo commitLog}}}) to {{repo}} ({{branch}}) are ready.
-<http://{{domain}}/{{owner.login}}/boxSelection/{{repoName}}/{{encode branch}}/{{encode headCommit.message}}/{{headCommit.id}}|Choose a server to run {{branch}}>.
+<http://{{domain}}/{{owner.login}}/serverSelection/{{repoName}}?branch={{encode branch}}&message={{encode headCommit.message}}&commit={{headCommit.id}}|Choose a server to run {{branch}}>.

test/fixtures/github-hooks.js

@@ -133,7 +133,8 @@ module.exports = function (data) {
             'created_at': '2015-01-27T21:06:49Z',
             'updated_at': '2015-01-27T21:06:49Z',
             'body': '[Select Runnable server to run code from this PR](http://runnable3.net/' + owner +
-              '/boxSelection/hellonode/feature-1/commit/73033125786a9897dc92659245598be520a2d71d)'
+              '/serverSelection/hellonode?branch=feature-1' +
+              '&message=commit&commit=73033125786a9897dc92659245598be520a2d71d)'
           },
           'repository': {
             'id': 28254077,

unit/github-notifier.js

@@ -43,8 +43,8 @@ describe('GitHub Notifier',  function () {
 
       var message = github._renderMessage(githubPushInfo, []);
       var msg = '[Choose a server]';
-      msg += '(http://runnable3.net/podviaznikov/boxSelection/';
-      msg += 'api/fix%252F1/hey%2520there/a240edf982d467201845b3bf10ccbe16f6049ea9?source=pr)';
+      msg += '(http://runnable3.net/podviaznikov/serverSelection/api?branch=';
+      msg += 'fix%252F1&message=hey%2520there&commit=a240edf982d467201845b3bf10ccbe16f6049ea9&source=pr)';
       msg += ' to run PR-2.';
       expect(message).to.equal(msg);
       done();

unit/notifier.js

@@ -47,9 +47,9 @@ describe('Notifier',  function () {
       message += '<' + wrapGitHubLink(headCommit.url) + '|changes>';
       message += ' (init &amp; commit &amp; push long test   next line   3d...) to CodeNow/api (develop) are ready.\n';
       message += '<http://runnable3.net/';
-      message += 'podviaznikov/boxSelection/api/develop/init%2520%2526%2520commit%2520%2526%2520';
+      message += 'podviaznikov/serverSelection/api?branch=develop&message=init%2520%2526%2520commit%2520%2526%2520';
       message += 'push%2520long%2520test%2520%250A%2520next%2520line%2520%250A%25203d%2520line';
-      message += '/a240edf982d467201845b3bf10ccbe16f6049ea9';
+      message += '&commit=a240edf982d467201845b3bf10ccbe16f6049ea9';
       message += '|Choose a server to run develop>.';
       expect(text).to.equal(message);
       cb();
@@ -85,8 +85,9 @@ describe('Notifier',  function () {
       message += '<' + wrapGitHubLink(headCommit.url) + '|changes>';
       message += ' (init &amp; commit &amp; push) to CodeNow/api (feature-1/fix) are ready.\n';
       message += '<http://runnable3.net/';
-      message += 'podviaznikov/boxSelection/api/feature-1%252Ffix/init%2520%2526%2520commit%2520%2526%2520push';
-      message += '/a240edf982d467201845b3bf10ccbe16f6049ea9';
+      message += 'podviaznikov/serverSelection/api?';
+      message += 'branch=feature-1%252Ffix&message=init%2520%2526%2520commit%2520%2526%2520push';
+      message += '&commit=a240edf982d467201845b3bf10ccbe16f6049ea9';
       message += '|Choose a server to run feature-1/fix>.';
       expect(text).to.equal(message);
       cb();
@@ -171,8 +172,9 @@ describe('Notifier',  function () {
       var message = 'podviaznikov\'s ';
       message += '<a href="' + wrapGitHubLink(headCommit.url) + '">changes</a>';
       message += ' (hey there second line third line some random...) to Runnable/api (feature-1/fix) are ready.\n';
-      message += '<a href=\"http://runnable3.net/podviaznikov/boxSelection/api/feature-1%252Ffix/%2520hey%2520there';
-      message += '%250Asecond%2520line%250Athird%2520line%250Asome%2520random%2520mesage/';
+      message += '<a href=\"http://runnable3.net/podviaznikov/serverSelection/api';
+      message += '?branch=feature-1%252Ffix&message=%2520hey%2520there';
+      message += '%250Asecond%2520line%250Athird%2520line%250Asome%2520random%2520mesage&commit=';
       message += 'a240edf982d467201845b3bf10ccbe16f6049ea9\">Choose a server to run feature-1/fix</a>.';
       expect(text).to.equal(message);
       cb();