diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.meteor/.gitignore b/.meteor/.gitignore index 4083037..501f92e 100644 --- a/.meteor/.gitignore +++ b/.meteor/.gitignore @@ -1 +1,2 @@ +dev_bundle local diff --git a/.meteor/release b/.meteor/release index 74a74cb..fcf9d2d 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.2 +METEOR@1.3.5.1 diff --git a/client/main.html b/client/main.html index 24ae75e..090f6bd 100644 --- a/client/main.html +++ b/client/main.html @@ -16,6 +16,6 @@ diff --git a/client/views/testscripts/testscript.js b/client/views/testscripts/testscript.js index d63ae64..98edc25 100644 --- a/client/views/testscripts/testscript.js +++ b/client/views/testscripts/testscript.js @@ -1,3 +1,21 @@ +Template.testscript.rendered = function(){ + if (!this.rendered) { + this.findAll('.testscript-steps').forEach(function(html) { + var new_html = html.innerHTML.replace(/(((ftp|https?|http?|www.?):\/\/)[\-\w@:%_\+.~#;?,&\/\/=]+)/g, function(text, link) { + var real_link = link.replace(",",""); + link = link.replace(/^(.*)(?:musthave\.local\.onsugar\.)(.*)/, '$1musthaveqa.popsugar.$2'); + if (real_link[real_link.length-1] === ".") real_link = real_link.slice(0,-1); + real_link = real_link.replace(/^(.*)(?:musthave\.local\.onsugar\.)(.*)/, '$1musthaveqa.popsugar.$2'); + return ''+ link +''; + }); + + html.innerHTML = new_html; + }); + + this.rendered = true; + } + +}; Template.testscript.events({ 'click .failure-reason-cancel': function(e) { failReason = $(e.currentTarget).parents('.failure-reason'); diff --git a/lib/config.js b/lib/config.js index d34f748..d10c31b 100644 --- a/lib/config.js +++ b/lib/config.js @@ -1,10 +1,10 @@ Config = { jira: { protocol: 'https://', - host: 'shopstyle.atlassian.net', - user: 'shopstylebot', + host: 'popsugar.atlassian.net', + user: 'popsugarwrangler', verifiedStatusName: 'Verified', - mergedStatusName: 'Merged', + mergedStatusName: 'Testing', toDoStatusName: 'To Do', inProgressStatusName: 'In Progress', inReviewStatusName: 'In Review', @@ -13,9 +13,9 @@ Config = { defaultNumTestersPerTicket: 2, notAssignedName: '-- Not Assigned', browserOptions: [ - 'IE9', 'IE10', 'IE11', + 'Edge', 'Chrome', 'Firefox', 'iPad', diff --git a/packages/assembla/assembla.js b/packages/assembla/assembla.js index 4c3475d..1bf6695 100644 --- a/packages/assembla/assembla.js +++ b/packages/assembla/assembla.js @@ -1,9 +1,9 @@ Assembla = { - milestonesUrl: 'https://api.assembla.com/v1/spaces/shopstyle/milestones/upcoming.json', - ticketsUrl: 'https://api.assembla.com/v1/spaces/shopstyle/tickets/milestone/', - usersUrl: 'https://api.assembla.com/v1/spaces/shopstyle/users.json', - assemblaUrl: 'https://www.assembla.com/spaces/shopstyle/tickets/', - ticketUrl: 'https://api.assembla.com/v1/spaces/shopstyle/tickets/', + milestonesUrl: 'https://api.assembla.com/v1/spaces/popsugar/milestones/upcoming.json', + ticketsUrl: 'https://api.assembla.com/v1/spaces/popsugar/tickets/milestone/', + usersUrl: 'https://api.assembla.com/v1/spaces/popsugar/users.json', + assemblaUrl: 'https://www.assembla.com/spaces/popsugar/tickets/', + ticketUrl: 'https://api.assembla.com/v1/spaces/popsugar/tickets/', testscriptsAndcommentRegex: /TESTING([\s\S]*)END/, commentRegex: /COMMENTS([\s\S]*?)(?=TESTSCRIPT)/, testscriptsRegex: /TESTSCRIPT([\s\S]*)/, @@ -233,7 +233,7 @@ Assembla.watchTicketStream = function() { if (date < lastTime) { return; } - if (item.ticket && item.author_name !== "shopstylebot") { + if (item.ticket && item.author_name !== "popsugarbot") { var url = Assembla.ticketUrl + item.ticket.number + '.json'; var ticket = Assembla.makeGetRequest(url, {}); Assembla.updateSingleTicket(ticket.data); diff --git a/server/assembla.js b/server/assembla.js index ee3a4cf..11da19b 100644 --- a/server/assembla.js +++ b/server/assembla.js @@ -1,9 +1,9 @@ // Assembla = { -// milestonesUrl: 'https://api.assembla.com/v1/spaces/shopstyle/milestones/upcoming.json', -// ticketsUrl: 'https://api.assembla.com/v1/spaces/shopstyle/tickets/milestone/', -// usersUrl: 'https://api.assembla.com/v1/spaces/shopstyle/users.json', -// assemblaUrl: 'https://www.assembla.com/spaces/shopstyle/tickets/', -// ticketUrl: 'https://api.assembla.com/v1/spaces/shopstyle/tickets/', +// milestonesUrl: 'https://api.assembla.com/v1/spaces/popsugar/milestones/upcoming.json', +// ticketsUrl: 'https://api.assembla.com/v1/spaces/popsugar/tickets/milestone/', +// usersUrl: 'https://api.assembla.com/v1/spaces/popsugar/users.json', +// assemblaUrl: 'https://www.assembla.com/spaces/popsugar/tickets/', +// ticketUrl: 'https://api.assembla.com/v1/spaces/popsugar/tickets/', // testscriptsAndcommentRegex: /TESTING([\s\S]*)END/, // commentRegex: /COMMENTS([\s\S]*?)(?=TESTSCRIPT)/, // testscriptsRegex: /TESTSCRIPT([\s\S]*)/, @@ -233,7 +233,7 @@ // if (date < lastTime) { // return; // } -// if (item.ticket && item.author_name !== "shopstylebot") { +// if (item.ticket && item.author_name !== "popsugarbot") { // var url = Assembla.ticketUrl + item.ticket.number + '.json'; // var ticket = Assembla.makeGetRequest(url, {}); // Assembla.updateSingleTicket(ticket.data); diff --git a/server/jira.js b/server/jira.js index 8a32695..9ddf5da 100644 --- a/server/jira.js +++ b/server/jira.js @@ -11,7 +11,8 @@ Jira = { // 'project/BE/versions' is used because versions are specific to projects. // PM's keep all versions on all prjects, so we just hit the BE project endpoint // and get its versions, which should be shopstyle wide - milestonesUrl: 'project/BE/versions', + // This needs to be updated for PopSugar + milestonesUrl: 'project/TTP/versions', usersUrl: 'group', ticketUrl: 'search', testscriptCustomField: 'customfield_10111', @@ -118,7 +119,7 @@ Jira.updateSingleTicket = function(ticket) { Jira.updateTestscripts(ticket); - var jiraUrl = 'https://shopstyle.atlassian.net/browse/' + ticket.key; + var jiraUrl = 'https://popsugar.atlassian.net/browse/' + ticket.key; var statusName = ticket.fields.status.name; var jiraId = parseInt(ticket.id); if (statusName === Config.jira.verifiedStatusName) { @@ -264,7 +265,7 @@ Jira.verifyTicketOnDev = function(ticket) { // Perform transition id 131, aka "Verify" action var data = { transition: { - id: 131 + id: 111 } }; @@ -285,7 +286,7 @@ Jira.reOpenTicket = function(ticket) { // Perform transition id 201, aka "Reopen" action var data = { transition: { - id: 201 + id: 11 } };