mirror of
https://github.com/google/blockly.git
synced 2026-01-11 02:47:09 +01:00
Merge branch 'master' of https://github.com/google/blockly into rc/Apr_20
This commit is contained in:
@@ -16,6 +16,8 @@ a few minutes and will help us better support the Blockly community.
|
||||
|
||||
Cross-browser Testing Platform and Open Source <3 Provided by [Sauce Labs](https://saucelabs.com)
|
||||
|
||||
We support IE11 and test it using [BrowserStack](https://browserstack.com)
|
||||
|
||||
Want to contribute? Great! First, read [our guidelines for contributors](https://developers.google.com/blockly/guides/modify/contributing).
|
||||
|
||||
## Releases
|
||||
|
||||
@@ -316,7 +316,7 @@ function test_procedureEnableDisableInteractions() {
|
||||
|
||||
assertTrue('Callers are disabled when their definition is disabled.',
|
||||
barCalls[0].disabled && barCalls[1].disabled);
|
||||
assertTrue('Callers in definitions are disabled by inheritence.',
|
||||
assertTrue('Callers in definitions are disabled by inheritance.',
|
||||
!fooCalls[0].disabled && fooCalls[0].getInheritedDisabled());
|
||||
|
||||
fooDef.setEnabled(false);
|
||||
@@ -329,7 +329,7 @@ function test_procedureEnableDisableInteractions() {
|
||||
assertTrue('Callers are reenabled with their definition',
|
||||
!barCalls[0].disabled && !barCalls[0].disabled);
|
||||
|
||||
assertTrue('Nested disabled callers remain disabled, not by inheritence.',
|
||||
assertTrue('Nested disabled callers remain disabled, not by inheritance.',
|
||||
fooCalls[0].disabled && !fooCalls[0].getInheritedDisabled());
|
||||
|
||||
bazDef.setEnabled(false);
|
||||
@@ -337,7 +337,7 @@ function test_procedureEnableDisableInteractions() {
|
||||
assertTrue('Caller is disabled with its definition',
|
||||
bazCall.disabled);
|
||||
|
||||
assertTrue('Caller in the return is disabled by inheritence.',
|
||||
assertTrue('Caller in the return is disabled by inheritance.',
|
||||
!barCalls[1].disabled && barCalls[1].getInheritedDisabled());
|
||||
|
||||
barDef.setEnabled(false);
|
||||
@@ -346,7 +346,7 @@ function test_procedureEnableDisableInteractions() {
|
||||
|
||||
bazDef.setEnabled(true);
|
||||
|
||||
assertTrue('Caller in the return remains disabled, not by inheritence.',
|
||||
assertTrue('Caller in the return remains disabled, not by inheritance.',
|
||||
barCalls[1].disabled && !barCalls[1].getInheritedDisabled());
|
||||
|
||||
} finally {
|
||||
|
||||
Reference in New Issue
Block a user