Merge branch 'master' into improve-button-screenshots

packages/react-ui-screenshot-tests/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.6](https://github.com/skbkontur/retail-ui/compare/[email protected]@1.1.6) (2019-03-27)
+
+**Note:** Version bump only for package react-ui-screenshot-tests
+
+
+
+
+
 ## [1.1.5](https://github.com/skbkontur/retail-ui/compare/[email protected]@1.1.5) (2019-03-26)
 
 **Note:** Version bump only for package react-ui-screenshot-tests

packages/react-ui-screenshot-tests/gemini/dropdownContainer.js

@@ -15,36 +15,21 @@ var initTest = (suite, showLongItems) =>
       }
     });
 
-var pageScrollTest = suite =>
+var innerScrollTest = suite =>
   suite.capture('shot', actions => {
     actions.executeJS(function(window) {
-      var doc = window.document.documentElement;
-      doc.scrollTop = doc.scrollHeight - doc.offsetHeight;
-      doc.scrollLeft = doc.scrollWidth - doc.offsetWidth;
+      var innerScroll = window.document.querySelector('#inner-scroll');
+      innerScroll.scrollTop = innerScroll.scrollHeight;
+      innerScroll.scrollLeft = innerScroll.scrollWidth;
     });
   });
 
-var innerScrollTest = suite =>
-  suite
-    .capture('shot', actions => {
-      actions.executeJS(function(window) {
-        var innerScroll = window.document.querySelector('#inner-scroll');
-        innerScroll.scrollTop = innerScroll.scrollHeight - innerScroll.offsetHeight;
-        innerScroll.scrollLeft = innerScroll.scrollWidth - innerScroll.offsetWidth;
-      });
-    })
-    .skip.in('ie11', 'ie иногда не до конца скролит элемент (разница в пару px)');
-
 gemini.suite('DropdownContainer', () => {
   gemini.suite('short Items', () => {
     gemini.suite('items', suite => {
       initTest(suite).capture('shot');
     });
 
-    gemini.suite('page scroll', suite => {
-      pageScrollTest(initTest(suite));
-    });
-
     gemini.suite('inner scroll', suite => {
       innerScrollTest(initTest(suite));
     });
@@ -55,10 +40,6 @@ gemini.suite('DropdownContainer', () => {
       initTest(suite, true).capture('shot');
     });
 
-    gemini.suite('page scroll', suite => {
-      pageScrollTest(initTest(suite, true));
-    });
-
     gemini.suite('inner scroll', suite => {
       innerScrollTest(initTest(suite, true));
     });

packages/react-ui-screenshot-tests/gemini/input.js

@@ -112,18 +112,20 @@ gemini.suite('Input with mask', suite => {
       action.click(input);
     })
     .capture('Editing', action => {
-      /** NOTE: ухищрения, чтоб не мигал в ie */
-      const sampleString = '912247';
-      sampleString.split('').forEach(char => {
-        action.wait(500);
-        action.sendKeys(input, char);
-      });
+      action.sendKeys(input, '9');
     })
     .capture('Blured', action => {
       action.sendKeys(input, gemini.TAB);
     });
 });
 
+gemini.suite('Input with placeholder and mask', suite => {
+  suite
+    .before(renderStory('Input', 'Placeholder and Mask'))
+    .setCaptureElements('#test-element')
+    .capture('Plain');
+});
+
 gemini.suite('Input with prefix and suffix', () => {
   gemini.suite('Size small', suite => {
     suite