diff options
6 files changed, 16 insertions, 104 deletions
diff --git a/libs/bower_components/mousetrap/plugins/record/tests/index.html b/libs/bower_components/mousetrap/plugins/record/tests/index.html deleted file mode 100644 index 5608f09e67..0000000000 --- a/libs/bower_components/mousetrap/plugins/record/tests/index.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE html> -<html> - - <head> - <title>Jelly</title> - <meta charset=utf-8> - <link href="jelly.css" rel="stylesheet"> - </head> - - <body> - <h1>Jelly</h1> - - <h2>For testing the <strong>record</strong> extension</h2> - - <p>Click "Record" to test recording a sequence.</p> - <button class="test-record">Record</button> - <div class="test-record-result"></div> - - <script type="text/javascript" src="../../../tests/libs/jquery-1.7.2.min.js"></script> - <script type="text/javascript" src="../../../mousetrap.js"></script> - <script type="text/javascript" src="../mousetrap-record.js"></script> - <script type="text/javascript" src="jelly.js"></script> - - <script type="text/javascript"> - Jelly.spread(); - </script> - </body> - -</html> diff --git a/libs/bower_components/mousetrap/plugins/record/tests/jelly.css b/libs/bower_components/mousetrap/plugins/record/tests/jelly.css deleted file mode 100644 index a071c77c98..0000000000 --- a/libs/bower_components/mousetrap/plugins/record/tests/jelly.css +++ /dev/null @@ -1,18 +0,0 @@ -body { - font-family: helvetica, arial, sans-serif; - line-height: 20px; -} - -kbd { - background-color: #ccc; - display: inline-block; - padding: 0.5ex 1em; -} - -.test-record-result { - margin-top: 20px; -} - -.test-record-result span:nth-child(n+2) { - margin-left: 10px; -} diff --git a/libs/bower_components/mousetrap/plugins/record/tests/jelly.js b/libs/bower_components/mousetrap/plugins/record/tests/jelly.js deleted file mode 100644 index 57ff01a028..0000000000 --- a/libs/bower_components/mousetrap/plugins/record/tests/jelly.js +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Peanut butter goes great with jelly. - * - * @author Dan Tao <daniel.tao@gmail.com> - */ -var Jelly = (function() { - var recordButton = $("button.test-record"), - recordResult = $("div.test-record-result"); - - function _formatSequenceAsHtml(sequence) { - var combos = [], - i; - - for (i = 0; i < sequence.length; ++i) { - combos.push('<span>' + _formatKeysAsHtml(sequence[i].split('+')) + '</span>'); - } - - return combos.join(' '); - } - - function _formatKeysAsHtml(keys) { - var htmlKeys = [], - i; - - for (i = 0; i < keys.length; ++i) { - htmlKeys.push('<kbd>' + keys[i] + '</kbd>'); - } - - return htmlKeys.join('+'); - } - - function _prepareRecordTest() { - recordButton.prop('disabled', true); - recordButton.text('Recording'); - - Mousetrap.record(function(sequence) { - recordResult.html(_formatSequenceAsHtml(sequence)); - recordButton.prop('disabled', false); - recordButton.text('Record'); - }); - - // take focus away from the button so that Mousetrap will actually - // capture keystrokes - recordButton.blur(); - } - - return { - spread: function() { - recordButton.click(_prepareRecordTest); - } - }; - -})(); diff --git a/plugins/Overlay/templates/renderSidebar.twig b/plugins/Overlay/templates/renderSidebar.twig index 36ff9c8ba1..0b8c0fbf80 100644 --- a/plugins/Overlay/templates/renderSidebar.twig +++ b/plugins/Overlay/templates/renderSidebar.twig @@ -1,4 +1,4 @@ -<div> <!-- Wrapper is needed that the html can be jqueryfied --> +<div> <!-- Wrapper is needed that the html can be jQueryfied --> <!-- This div is removed by JS and the content is put in the location div --> <div class="overlayLocation"> diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig index 8d03b6d5bd..22241c389f 100644 --- a/plugins/SegmentEditor/templates/_segmentSelector.twig +++ b/plugins/SegmentEditor/templates/_segmentSelector.twig @@ -32,7 +32,7 @@ </div> </div> - <div class="initial-state-rows">{# no space here important for jquery #}<div class="segment-add-row initial"><div> + <div class="initial-state-rows">{# no space here important for jQuery #}<div class="segment-add-row initial"><div> <span>+ {{ 'SegmentEditor_DragDropCondition'|translate|raw }}</span> </div></div> <div class="segment-and">{{ 'SegmentEditor_OperatorAND'|translate|raw }}</div> diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php index b0e3e97c77..67187046e1 100644 --- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php @@ -137,7 +137,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase */ public function testTemplatesDontContainJquery($extension) { - $patternFailIfFound = 'jquery.'; + $patternFailIfFound = 'jquery'; // known files that will for sure not contain a "buggy" $patternFailIfFound $whiteListedFiles = array( @@ -164,13 +164,25 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase */ private function assertFilesDoNotContain($files, $patternFailIfFound, $whiteListedFiles) { + $foundPatterns = array(); foreach ($files as $file) { if($this->isFileOrPathWhitelisted($whiteListedFiles, $file)) { continue; } $content = file_get_contents($file); - $this->assertFalse(strpos($content, $patternFailIfFound), sprintf('forbidden pattern "%s" was found in the file: %s ---> please delete this file from Git.', $patternFailIfFound, $file)); + $foundPattern = strpos($content, $patternFailIfFound) !== false; + + if($foundPattern) { + $foundPatterns[] = $file; + } } + + $this->assertEmpty($foundPatterns, + sprintf("Forbidden pattern \"%s\" was found in the following files ---> please manually delete these files from Git. \n\n\t%s", + $patternFailIfFound, + implode("\n\t", $foundPatterns) + ) + ); } /** |