-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'biomage/master' into biomage-changes-4
- Loading branch information
Showing
13 changed files
with
20 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,7 +54,7 @@ const buildPipelineStatusEmailBody = (experimentId, status, user) => { | |
Data: 'Cellenics experiment status', | ||
}, | ||
}, | ||
Source: isHMS ? '[email protected]' : 'notification@biomage.net', | ||
Source: isHMS ? '[email protected]' : `notification@${process.env.DOMAIN_NAME}`, | ||
}; | ||
return params; | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,7 +49,7 @@ const buildUserInvitedEmailBody = (email, experimentId, inviterUser) => { | |
Data: 'Invitation to join a project in Cellenics', | ||
}, | ||
}, | ||
Source: isHMS ? '[email protected]' : 'notification@biomage.net', | ||
Source: isHMS ? '[email protected]' : `notification@${process.env.DOMAIN_NAME}`, | ||
}; | ||
return params; | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,7 +49,7 @@ const buildUserInvitedNotRegisteredEmailBody = (email, inviterUser) => { | |
Data: 'Invitation to join a project in Cellenics', | ||
}, | ||
}, | ||
Source: isHMS ? '[email protected]' : 'notification@biomage.net', | ||
Source: isHMS ? '[email protected]' : `notification@${process.env.DOMAIN_NAME}`, | ||
}; | ||
return params; | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,8 @@ const mockInvitedUserEmail = '[email protected]'; | |
const mockInviterUser = { email: '[email protected]' }; | ||
const mockRole = AccessRole.EXPLORER; | ||
|
||
process.env.DOMAIN_NAME = 'localhost.test'; | ||
|
||
describe('creatUserInvite', () => { | ||
beforeEach(async () => { | ||
jest.clearAllMocks(); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,8 @@ const mockUser = { | |
email: '[email protected]', | ||
}; | ||
|
||
process.env.DOMAIN_NAME = 'localhost.test'; | ||
|
||
describe('buildUserInvitedNotRegisteredEmailBody', () => { | ||
it('Should build the correct message for SUCCEEDED status', () => { | ||
const emailParams = buildPipelineStatusEmailBody(mockExperimentId, SUCCEEDED, mockUser); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,8 @@ const testUserEmail = '[email protected]'; | |
const mockInviterUser = { email: '[email protected]' }; | ||
const mockExperimentId = 'mock-experiment-id'; | ||
|
||
process.env.DOMAIN_NAME = 'localhost.test'; | ||
|
||
describe('buildUserInvitedEmailBody', () => { | ||
it('Should build the correct message', () => { | ||
const emailParams = buildUserInvitedEmailBody(testUserEmail, mockExperimentId, mockInviterUser); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ const buildUserInvitedNotRegisteredEmailBody = require('../../../src/utils/email | |
const testUserEmail = '[email protected]'; | ||
const mockInviterUser = { email: '[email protected]' }; | ||
|
||
process.env.DOMAIN_NAME = 'localhost.test'; | ||
|
||
describe('buildUserInvitedNotRegisteredEmailBody', () => { | ||
it('Should build the correct message', () => { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters