From 63aa1793b9694530a29973c508aad7f69af8b43e Mon Sep 17 00:00:00 2001 From: Dan Rogers Date: Fri, 26 May 2017 13:48:43 -0400 Subject: [PATCH 01/10] Update settings for PopSugar. --- lib/config.js | 6 +++--- server/jira.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/config.js b/lib/config.js index d34f748..a786f3b 100644 --- a/lib/config.js +++ b/lib/config.js @@ -1,8 +1,8 @@ Config = { jira: { protocol: 'https://', - host: 'shopstyle.atlassian.net', - user: 'shopstylebot', + host: 'popsugar.atlassian.net', + user: 'popsugarwrangler', verifiedStatusName: 'Verified', mergedStatusName: 'Merged', toDoStatusName: 'To Do', @@ -13,9 +13,9 @@ Config = { defaultNumTestersPerTicket: 2, notAssignedName: '-- Not Assigned', browserOptions: [ - 'IE9', 'IE10', 'IE11', + 'Edge', 'Chrome', 'Firefox', 'iPad', diff --git a/server/jira.js b/server/jira.js index 8a32695..3211d3d 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/PSMH/versions', usersUrl: 'group', ticketUrl: 'search', testscriptCustomField: 'customfield_10111', From f6353c7f82e00726f9de16f15dade0b06f8753da Mon Sep 17 00:00:00 2001 From: Dan Rogers Date: Fri, 26 May 2017 16:14:32 -0400 Subject: [PATCH 02/10] Change project for milestones. --- server/jira.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/jira.js b/server/jira.js index 3211d3d..b611737 100644 --- a/server/jira.js +++ b/server/jira.js @@ -12,7 +12,7 @@ Jira = { // 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 // This needs to be updated for PopSugar - milestonesUrl: 'project/PSMH/versions', + milestonesUrl: 'project/PSAPP/versions', usersUrl: 'group', ticketUrl: 'search', testscriptCustomField: 'customfield_10111', From 9de985e0d12aa4ee8e5676bec956d77a511ce146 Mon Sep 17 00:00:00 2001 From: Dan Rogers Date: Thu, 1 Jun 2017 18:07:24 -0400 Subject: [PATCH 03/10] Upgrade meteor to a modern version that works. --- .meteor/release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 3bb3d321a2a015a013511c6d2edb47dd45511258 Mon Sep 17 00:00:00 2001 From: Dan Rogers Date: Tue, 6 Jun 2017 15:39:44 -0400 Subject: [PATCH 04/10] More changes from shopstyle to popsugar. --- client/main.html | 2 +- packages/assembla/assembla.js | 12 ++++++------ server/assembla.js | 12 ++++++------ server/jira.js | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) 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/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 b611737..f56711d 100644 --- a/server/jira.js +++ b/server/jira.js @@ -119,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) { From d18946beb65569eb144d28de1f59348cf05f9639 Mon Sep 17 00:00:00 2001 From: Dan Rogers Date: Fri, 9 Jun 2017 15:26:18 -0400 Subject: [PATCH 05/10] Update project to use to find milestones. --- server/jira.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/jira.js b/server/jira.js index f56711d..01cc2d5 100644 --- a/server/jira.js +++ b/server/jira.js @@ -12,7 +12,7 @@ Jira = { // 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 // This needs to be updated for PopSugar - milestonesUrl: 'project/PSAPP/versions', + milestonesUrl: 'project/PAP/versions', usersUrl: 'group', ticketUrl: 'search', testscriptCustomField: 'customfield_10111', From 9c764fffed25efed340f870a773cb6328c9a0689 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 15 Jun 2017 13:17:40 -0700 Subject: [PATCH 06/10] Minor updates for testing --- .idea/vcs.xml | 6 ++++++ lib/config.js | 1 + server/jira.js | 8 ++++---- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .idea/vcs.xml 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/lib/config.js b/lib/config.js index a786f3b..80db270 100644 --- a/lib/config.js +++ b/lib/config.js @@ -5,6 +5,7 @@ Config = { user: 'popsugarwrangler', verifiedStatusName: 'Verified', mergedStatusName: 'Merged', + testStatusName: 'Testing', toDoStatusName: 'To Do', inProgressStatusName: 'In Progress', inReviewStatusName: 'In Review', diff --git a/server/jira.js b/server/jira.js index 01cc2d5..e43cad5 100644 --- a/server/jira.js +++ b/server/jira.js @@ -12,7 +12,7 @@ Jira = { // 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 // This needs to be updated for PopSugar - milestonesUrl: 'project/PAP/versions', + milestonesUrl: 'project/TTP/versions', usersUrl: 'group', ticketUrl: 'search', testscriptCustomField: 'customfield_10111', @@ -47,7 +47,7 @@ Jira.getStandardJqlQueryString = function() { var jqlQueryString = "fixVersion IN ('" + versionTitle + "') AND status IN ('" - + Config.jira.mergedStatusName + + Config.jira.testStatusName + "', '" + Config.jira.verifiedStatusName + "', '" @@ -265,7 +265,7 @@ Jira.verifyTicketOnDev = function(ticket) { // Perform transition id 131, aka "Verify" action var data = { transition: { - id: 131 + id: 31 } }; @@ -286,7 +286,7 @@ Jira.reOpenTicket = function(ticket) { // Perform transition id 201, aka "Reopen" action var data = { transition: { - id: 201 + id: 11 } }; From 1c88e0596a471bbc1f0270f37ef0b092b6840ca4 Mon Sep 17 00:00:00 2001 From: Dan Rogers Date: Mon, 19 Jun 2017 14:37:07 -0400 Subject: [PATCH 07/10] Update .meteor/.gitignore. --- .meteor/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.meteor/.gitignore b/.meteor/.gitignore index 4083037..501f92e 100644 --- a/.meteor/.gitignore +++ b/.meteor/.gitignore @@ -1 +1,2 @@ +dev_bundle local From 6cc91a6f6f018d9e40047776ed98dccacf34ef81 Mon Sep 17 00:00:00 2001 From: henrycchen Date: Thu, 22 Jun 2017 11:55:25 -0700 Subject: [PATCH 08/10] Updating new to testing status is # 91, verified status is # 111, and To Do status is # 11 Old update was: The project would be TTP and we would switch out (201 with 11) and (131 with 31) --- server/jira.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/jira.js b/server/jira.js index e43cad5..22e2e69 100644 --- a/server/jira.js +++ b/server/jira.js @@ -265,7 +265,7 @@ Jira.verifyTicketOnDev = function(ticket) { // Perform transition id 131, aka "Verify" action var data = { transition: { - id: 31 + id: 111 } }; From 5e733920ada82d9fa5004b67765bc9eba7265d65 Mon Sep 17 00:00:00 2001 From: henrycchen Date: Mon, 26 Jun 2017 11:18:55 -0700 Subject: [PATCH 09/10] Changing testing status back to merge --- lib/config.js | 3 +-- server/jira.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/config.js b/lib/config.js index 80db270..d10c31b 100644 --- a/lib/config.js +++ b/lib/config.js @@ -4,8 +4,7 @@ Config = { host: 'popsugar.atlassian.net', user: 'popsugarwrangler', verifiedStatusName: 'Verified', - mergedStatusName: 'Merged', - testStatusName: 'Testing', + mergedStatusName: 'Testing', toDoStatusName: 'To Do', inProgressStatusName: 'In Progress', inReviewStatusName: 'In Review', diff --git a/server/jira.js b/server/jira.js index 22e2e69..9ddf5da 100644 --- a/server/jira.js +++ b/server/jira.js @@ -47,7 +47,7 @@ Jira.getStandardJqlQueryString = function() { var jqlQueryString = "fixVersion IN ('" + versionTitle + "') AND status IN ('" - + Config.jira.testStatusName + + Config.jira.mergedStatusName + "', '" + Config.jira.verifiedStatusName + "', '" From 9ddcb75ead33e380fc1b62ba4e124a28a8a1fdd0 Mon Sep 17 00:00:00 2001 From: Wayne Sheng Date: Fri, 18 Aug 2017 14:52:57 -0700 Subject: [PATCH 10/10] Add link recognize script --- client/views/testscripts/testscript.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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');