diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-05-15 17:46:00 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-05-15 19:48:55 +0100 |
| commit | 5d9a3dd0322edaef7d688fb6e3769a153ee2fe31 (patch) | |
| tree | 8c8d335dacb4f7190c2401819bc51f04d7ac3823 | |
| parent | 260e6cfaa9678a401f99978e1df3f0daae5b6f12 (diff) | |
[Cypress] Blacklist in config as fails in CLI.
| -rw-r--r-- | .cypress/cypress.json | 1 | ||||
| -rw-r--r-- | .cypress/cypress/integration/category_tests.js | 2 | ||||
| -rwxr-xr-x | bin/browser-tests | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.cypress/cypress.json b/.cypress/cypress.json index 554495d4b..7aeb54e08 100644 --- a/.cypress/cypress.json +++ b/.cypress/cypress.json @@ -1,6 +1,7 @@ { "baseUrl": "http://localhost:3001", "projectId": "y8vvs1", + "blacklistHosts": ["gaze.mysociety.org", "*.openstreetmap.org"], "env": { "postcode": "BS10 5EE" } diff --git a/.cypress/cypress/integration/category_tests.js b/.cypress/cypress/integration/category_tests.js index 60ef240fa..27a6ee289 100644 --- a/.cypress/cypress/integration/category_tests.js +++ b/.cypress/cypress/integration/category_tests.js @@ -58,8 +58,8 @@ describe('Basic categories', function() { expect(obj[0].value).to.equal(categories[i]); }); cy.get('#subcategory_Bins').should('not.be.visible'); - cy.get('select:eq(1)').select('Bins'); cy.wait('@report-ajax'); + cy.get('select:eq(1)').select('Bins'); cy.get('#subcategory_Bins').should('be.visible'); }); }); diff --git a/bin/browser-tests b/bin/browser-tests index c663e56af..a3548e50b 100755 --- a/bin/browser-tests +++ b/bin/browser-tests @@ -90,7 +90,7 @@ sub run { if (($run_cypress && !$run_server) || $pid) { # Parent, run the test runner (then kill the child) - my $exit = system("cypress", $cmd, '--config', 'pluginsFile=false,supportFile=false,blacklistHosts=[gaze.mysociety.org,*.openstreetmap.org]', '--project', '.cypress', '--env', "cobrand=$cobrand", @ARGV); + my $exit = system("cypress", $cmd, '--config', 'pluginsFile=false,supportFile=false', '--project', '.cypress', '--env', "cobrand=$cobrand", @ARGV); kill 'TERM', $pid if $pid; exit $exit >> 8; } else { |