Merge branch 'MAGETWO-32125' of github.corp.ebay.com:magento-vanilla/magento2ce into PR

Mykhailo Miroshnikov · Mykhailo Miroshnikov · commit 7abb3594c3e7 · 2015-03-14T17:51:58.000+02:00
diff --git a/app/code/Magento/Store/view/base/web/templates/filter/store/item.html b/app/code/Magento/Store/view/base/web/templates/filter/store/item.html
@@ -5,7 +5,7 @@
  */
 -->
 <!-- ko ifnot: 'items' in option  -->
-    <option data-bind="attr: { label: option.label, value: option.value }"></option>
+    <option data-bind="attr: { label: option.label, value: option.value }, text: option.label"></option>
 <!-- /ko -->
 <!-- ko if: 'items' in option  -->
     <optgroup data-bind="attr: { label: option.label }"></optgroup>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
@@ -46,7 +46,7 @@ abstract class Grid extends Block
      *
      * @var string
      */
-    protected $resetButton = '[title="Reset Filter"][class*=action]';
+    protected $resetButton = '.action-reset';
 
     /**
      * The first row in grid. For this moment we suggest that we should strictly define what we are going to search

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ abstract class Grid extends Block`
`46`	`46`	`*`
`47`	`47`	`* @var string`
`48`	`48`	`*/`
`49`		`- protected $resetButton = '[title="Reset Filter"][class*=action]';`
	`49`	`+ protected $resetButton = '.action-reset';`
`50`	`50`
`51`	`51`	`/**`
`52`	`52`	`* The first row in grid. For this moment we suggest that we should strictly define what we are going to search`