diff --git a/package.json b/package.json index aaa86ce7d..1c15e9a1e 100644 --- a/package.json +++ b/package.json @@ -105,12 +105,12 @@ "rimraf": "^2.6.1", "scratch-audio": "0.1.0-prerelease.20190114210212", "scratch-blocks": "0.1.0-prerelease.1548864869", - "scratch-l10n": "3.1.20190123150639", + "scratch-l10n": "3.1.20190130142816", "scratch-paint": "0.2.0-prerelease.20190114205252", "scratch-render": "0.1.0-prerelease.20190128154859", "scratch-storage": "1.2.2", "scratch-svg-renderer": "0.2.0-prerelease.20190125192231", - "scratch-vm": "0.2.0-prerelease.20190128162704", + "scratch-vm": "0.2.0-prerelease.20190130160436", "selenium-webdriver": "3.6.0", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", diff --git a/src/css/z-index.css b/src/css/z-index.css index 93bdc533a..9f48b52aa 100644 --- a/src/css/z-index.css +++ b/src/css/z-index.css @@ -5,7 +5,6 @@ */ /* Toolbox z-index: 40; set in scratch-blocks */ -$z-index-menu-bar: 41; $z-index-extension-button: 42; $z-index-stage-indicator: 45; $z-index-add-button: 46; @@ -15,6 +14,7 @@ $z-index-monitor: 48; /* monitors go over add buttons */ $z-index-card: 480; $z-index-alerts: 490; +$z-index-menu-bar: 491; /* menu-bar should go over monitors, alerts and tutorials */ $z-index-loader: 500; $z-index-modal: 510; diff --git a/test/integration/project-loading.test.js b/test/integration/project-loading.test.js index 115c29576..384463062 100644 --- a/test/integration/project-loading.test.js +++ b/test/integration/project-loading.test.js @@ -156,7 +156,9 @@ describe('Loading scratch gui', () => { await inputElement.sendKeys(`scratch.mit.edu/projects/${projectId}`); await clickXpath('//button[@title="View Project"]'); await new Promise(resolve => setTimeout(resolve, 2000)); - await clickText('move'); + await clickText('Sounds'); + await clickXpath('//button[@aria-label="Choose a Sound"]'); + await clickText('A Bass', scope.modal); // Should close the modal await clickXpath( '//div[contains(@class, "menu-bar_menu-bar-item") and ' + 'contains(@class, "menu-bar_hoverable")][span[text()="File"]]'