Skip to content

Commit 3ccce42

Browse files
author
Denys Rul
committed
Merge branch 'MAGETWO-31191' of https://github.corp.ebay.com/magento-vanilla/magento2ce into MAGETWO-31191
2 parents 77d11a2 + b587ac3 commit 3ccce42

File tree

2 files changed

+21
-24
lines changed

2 files changed

+21
-24
lines changed

composer.lock

Lines changed: 20 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/System/VariableTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ public function testEditAction()
1717
{
1818
$this->dispatch('backend/admin/system_variable/edit');
1919
$body = $this->getResponse()->getBody();
20-
$this->assertContains('function toggleValueElement(element) {', $body);
20+
$this->assertContains('window.toggleValueElement = function(element) {', $body);
2121
}
2222
}

0 commit comments

Comments
 (0)