Skip to content

Commit

Permalink
aded done and wait
Browse files Browse the repository at this point in the history
  • Loading branch information
jrchudy committed Aug 15, 2018
1 parent 19a9efe commit 9b7c347
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ mdHelp.html
# ignore uploaded files
test/e2e/data_setup/uploaded_files/*.*
package-lock.json
entities.json
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ before_install:
- sudo make install PLATFORM=ubuntu1204
- sudo make deploy PLATFORM=ubuntu1204
- cd ..
- git clone https://github.com/informatics-isi-edu/ioboxd.git
- cd ioboxd
- sudo make deploy
- cd ..
- curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
- sudo apt-get install -y nodejs
- git clone https://github.com/informatics-isi-edu/ErmrestDataUtils.git
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,12 @@ describe('View recordset,', function() {
});
});

it("should have '2' options in the dropdown menu.", function () {
it("should have '2' options in the dropdown menu.", function (done) {
chaisePage.recordsetPage.getExportDropdown().click().then(function () {
expect(chaisePage.recordsetPage.getExportOptions().count()).toBe(2, "incorrect number of export options");
return chaisePage.recordsetPage.getExportDropdown().click();
}).then(function () {
done();
});
});

Expand Down Expand Up @@ -338,7 +340,9 @@ describe('View recordset,', function() {
var columns = accommodationParams.columns.filter(function(c) {
return (c.value != null && typeof c.comment == 'string');
});
chaisePage.recordsetPage.getColumnsWithUnderline().then(function(pageColumns) {
chaisePage.waitForElementInverse(element(by.css(".export-progress"))).then(function () {
return chaisePage.recordsetPage.getColumnsWithUnderline()
}).then(function(pageColumns) {
expect(pageColumns.length).toBe(columns.length);
var index = 0;
pageColumns.forEach(function(c) {
Expand Down

0 comments on commit 9b7c347

Please sign in to comment.