From 59ddd02c2f0948279d3e7c4de52e68b302ba8789 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 28 Jan 2019 19:29:10 +0000 Subject: [PATCH 1/7] chore(package): update scratch-vm to version 0.2.0-prerelease.20190128192220 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f3c64edb7..30a493c08 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "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.20190128155421", + "scratch-vm": "0.2.0-prerelease.20190128192220", "selenium-webdriver": "3.6.0", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", From a5358b5fbffbce47129c9308ba214e463846e6b6 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 30 Jan 2019 14:35:28 +0000 Subject: [PATCH 2/7] chore(package): update scratch-l10n to version 3.1.20190130142816 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 30a493c08..1c28de1c6 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "rimraf": "^2.6.1", "scratch-audio": "0.1.0-prerelease.20190114210212", "scratch-blocks": "0.1.0-prerelease.1548691077", - "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", From 7dd7f1ac60cde3743039aedf5d6c30e5b72187e1 Mon Sep 17 00:00:00 2001 From: chrisgarrity Date: Tue, 29 Jan 2019 18:29:32 +0100 Subject: [PATCH 3/7] Menus cover monitors fixes https://github.com/LLK/scratch-www/issues/2587 and https://github.com/LLK/scratch-gui/issues/4428 changed menu-bar z-index to one more than monitors so drop down menus cover monitors when opened. --- src/css/z-index.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 30e6b55b3b90f737484eeabcb572551d0dfd267c Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 30 Jan 2019 16:07:25 +0000 Subject: [PATCH 4/7] chore(package): update scratch-vm to version 0.2.0-prerelease.20190130160436 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 30a493c08..7f34e38f2 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "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.20190128192220", + "scratch-vm": "0.2.0-prerelease.20190130160436", "selenium-webdriver": "3.6.0", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", From af00f82944da482c542220470f330efca113f6a9 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 30 Jan 2019 16:22:01 +0000 Subject: [PATCH 5/7] chore(package): update scratch-blocks to version 0.1.0-prerelease.1548864869 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 30a493c08..2c2fec5b9 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "redux-throttle": "0.1.1", "rimraf": "^2.6.1", "scratch-audio": "0.1.0-prerelease.20190114210212", - "scratch-blocks": "0.1.0-prerelease.1548691077", + "scratch-blocks": "0.1.0-prerelease.1548864869", "scratch-l10n": "3.1.20190123150639", "scratch-paint": "0.2.0-prerelease.20190114205252", "scratch-render": "0.1.0-prerelease.20190128154859", From af462ec37240b1f09251dcd9e70d1a06399adde8 Mon Sep 17 00:00:00 2001 From: Karishma Chadha Date: Wed, 30 Jan 2019 11:25:07 -0500 Subject: [PATCH 6/7] Update project changes test to test a project change that should actually emit a change event. Clicking on blocks should not emit a project changed event. --- test/integration/project-loading.test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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"]]' From 90266ea22572ae7be63f10073bb0bd34f09e60d7 Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Wed, 30 Jan 2019 14:17:53 -0500 Subject: [PATCH 7/7] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 1e3d5a033..1c15e9a1e 100644 --- a/package.json +++ b/package.json @@ -104,6 +104,7 @@ "redux-throttle": "0.1.1", "rimraf": "^2.6.1", "scratch-audio": "0.1.0-prerelease.20190114210212", + "scratch-blocks": "0.1.0-prerelease.1548864869", "scratch-l10n": "3.1.20190130142816", "scratch-paint": "0.2.0-prerelease.20190114205252", "scratch-render": "0.1.0-prerelease.20190128154859",