'),
- fuw = new FileUploadWidget($node, {
- path: '/',
- userInfo: {
- user: fakeUser,
- globusLinked: true
- }
- }),
- renderedMsg = $node.find('.dz-message').html();
- expect(renderedMsg).toContain('
Three ways to add data to the staging area:
');
- expect(renderedMsg).toContain('
Click in this box.');
- expect(renderedMsg).toContain('
Drag and drop data files.');
- expect(renderedMsg).toContain('For large files (over 20GB) or a large number of files use');
- expect(renderedMsg).toContain(Config.get('upload').globus_upload_url);
- expect(renderedMsg).toContain(fakeUser);
- expect(renderedMsg).not.toContain('For large files (over 20GB), use Globus. Click');
- expect(renderedMsg).not.toContain('https://docs.kbase.us/data/globus');
- });
-
- it('Should render properly when not linked to globus', () => {
- const $node = $('
'),
- fuw = new FileUploadWidget($node, {
- path: '/',
- userInfo: {
- user: fakeUser,
- globusLinked: false
- }
- }),
- renderedMsg = $node.find('.dz-message').html();
- expect(renderedMsg).toContain('
Three ways to add data to the staging area:
');
- expect(renderedMsg).toContain('
Click in this box.');
- expect(renderedMsg).toContain('
Drag and drop data files.');
- expect(renderedMsg).toContain('For large files (over 20GB), use Globus. Click');
- expect(renderedMsg).toContain('https://docs.kbase.us/data/globus');
- expect(renderedMsg).not.toContain('For large files (over 20GB) or a large number of files use');
- expect(renderedMsg).not.toContain(Config.get('upload').globus_upload_url);
- });
-
it('Should be able to set and retrieve the path', () => {
const $node = $('
'),
fuw = new FileUploadWidget($node, {
@@ -157,23 +118,5 @@ define([
fuWidget.dropzone.addFile(mockFile);
});
- it('Should open a Globus window on click', () => {
- // first pass = no globus link.
- const unlinkedLink = 'https://docs.kbase.us/data/globus';
- spyOn(window, 'open').and.callThrough();
- fuWidget.$elem.find('a.globus_link').click();
- expect(window.open).toHaveBeenCalledWith(unlinkedLink, '_blank');
- const $node = $('
'),
- fuw = new FileUploadWidget($node, {
- path: '/',
- userInfo: {
- user: fakeUser,
- globusLinked: true
- }
- });
- fuw.$elem.find('a.globus_link').click();
- expect(window.open).toHaveBeenCalledWith('', 'dz-globus');
- });
-
});
});
diff --git a/test/unit/spec/narrative_core/upload/stagingAreaViewer-spec.js b/test/unit/spec/narrative_core/upload/stagingAreaViewer-spec.js
index 7a16f4ae72..125181d09a 100644
--- a/test/unit/spec/narrative_core/upload/stagingAreaViewer-spec.js
+++ b/test/unit/spec/narrative_core/upload/stagingAreaViewer-spec.js
@@ -88,7 +88,7 @@ define ([
expect(stagingViewer).not.toBeNull();
});
- it('Should render properly with a Globus linked account', async () => {
+ it('Should render properly with a Globus linked account', async (done) => {
let $node = $('
'),
linkedStagingViewer = new StagingAreaViewer($node, {
path: startingPath,
@@ -98,16 +98,33 @@ define ([
globusLinked: true
}
});
- await linkedStagingViewer.render();
- expect($node.html()).toContain('Or upload to this staging area by using');
- expect($node.html()).toContain('https://app.globus.org/file-manager?destination_id=c3c0a65f-5827-4834-b6c9-388b0b19953a&destination_path=' + fakeUser);
+ await linkedStagingViewer.render()
+ .then(() => {
+ var $globusButton = $node.find('.globus_linked');
+ expect($globusButton).toBeDefined();
+ expect($globusButton.html()).toContain('Upload with Globus');
+ expect($globusButton.html()).toContain('https://app.globus.org/file-manager?destination_id=c3c0a65f-5827-4834-b6c9-388b0b19953a&destination_path=' + fakeUser);
+ done();
+ });
+ });
+
+ it('Should render properly without a Globus linked account', async () => {
+ await stagingViewer.render();
+ var $globusButton = $targetNode.find('.globus_not_linked');
+ expect($globusButton).toBeDefined();
+ expect($globusButton.html()).toContain('Upload with Globus');
+ expect($globusButton.html()).toContain('https://docs.kbase.us/data/globus');
});
- it('Should render properly without a Globus linked account', () => {
- expect($targetNode.html()).not.toContain('Or upload to this staging area by using');
+ it('Should render a url button', async () => {
+ await stagingViewer.render();
+ var $urlButton = $targetNode.find('.web_upload_div');
+ expect($urlButton).toBeDefined();
+ expect($urlButton.html()).toContain('Upload with URL');
});
- it('Should start a help tour', () => {
+
+ it('Should start a help tour', function() {
stagingViewer.render();
stagingViewer.startTour();
expect(stagingViewer.tour).not.toBeNull();