Merge branch 'master' into fix/mouseover-after-disabled-button

alfa-laboratory · Jul 4, 2017 · 0a619da · 0a619da
2 parents c6d02e1 + 360f5cb
commit 0a619da
Show file tree

Hide file tree

Showing 17 changed files with 172 additions and 85 deletions.
diff --git a/.gemini.js b/.gemini.js
@@ -6,7 +6,7 @@ module.exports = {
     windowSize: '1024x768',
 
     httpTimeout: 60000,
-    retry: 2,
+    retry: 1,
     sessionsPerBrowser: 3,
     suitesPerSession: 150,
 
@@ -23,8 +23,6 @@ module.exports = {
     system: {
         debug: false,
         exclude: [
-            '.build/',
-            'coverage/',
             '*demo/',
             'docs/',
             'gemini/screens/',
@@ -34,6 +32,7 @@ module.exports = {
         ],
         plugins: {
             babel: true,
+            'html-reporter': {},
             optipng: true,
             react: {
                 jsModules: [
@@ -45,6 +44,7 @@ module.exports = {
             },
             'saucelabs-info': {}
         },
+        projectRoot: './',
         tempDir: './'
     }
 };
diff --git a/.travis.yml b/.travis.yml
@@ -20,17 +20,23 @@ install:
 
 before_script:
   - |
-      if [ "${TEST_SCOPE}" == "gemini" ]; then
-        curl -L https://gist.githubusercontent.com/teryaew/ab7c8a1c377ba0796f20a007a1d830eb/raw/sauce-connect.sh | bash
-        cat .gemini.js
-      fi
+    if [ "${TEST_SCOPE}" == "gemini" ]; then
+      curl -L https://gist.githubusercontent.com/teryaew/ab7c8a1c377ba0796f20a007a1d830eb/raw/sauce-connect.sh | bash
+      cat .gemini.js
+    fi
 
 script:
   - if [ "${TEST_SCOPE}" == "lint" ]; then yarn lint; fi
   - if [ "${TEST_SCOPE}" == "desktop_unit" ]; then yarn test; fi
   - if [ "${TEST_SCOPE}" == "mobile_unit" ]; then MOBILE=1 yarn test; fi
   - if [ "${TEST_SCOPE}" == "gemini" ]; then yarn gemini-ci; fi
 
+after_script:
+  - |
+    if [ "${TEST_SCOPE}" == "gemini" ]; then
+      kill -9 `lsof -i :4445 -t`
+    fi
+
 after_success:
   - |
     if [ "${TRAVIS_BRANCH}" == "master" ]; then

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="7.0.2"></a>
+## [7.0.2](https://github.com/alfa-laboratory/arui-feather/compare/v7.0.1...v7.0.2) (2017-07-03)
+
+
+### Bug Fixes
+
+* **fantasy:** fix form controls styles with disabled & invalid simultaneous states ([#141](https://github.com/alfa-laboratory/arui-feather/issues/141)) ([e2fd3c6](https://github.com/alfa-laboratory/arui-feather/commit/e2fd3c6))
+* **fantasy:** fix link border colors ([#143](https://github.com/alfa-laboratory/arui-feather/issues/143)) ([cc5f9d2](https://github.com/alfa-laboratory/arui-feather/commit/cc5f9d2))
+
+
+
 <a name="7.0.1"></a>
 ## [7.0.1](https://github.com/alfa-laboratory/arui-feather/compare/v7.0.0...v7.0.1) (2017-06-30)
 

diff --git a/gemini-utils/gemini-ci.js b/gemini-utils/gemini-ci.js
@@ -0,0 +1,38 @@
+/* eslint import/no-extraneous-dependencies: [2, {"devDependencies": true}] */
+/* eslint no-confusing-arrow: 0 */
+/* eslint strict: [0, "global"] */
+
+'use strict';
+
+const Gemini = require('gemini/api');
+const Events = require('gemini/lib/constants/events');
+const handleErrors = require('gemini/lib/cli/errors').handleErrors;
+const checkForDeprecations = require('gemini/lib/cli/deprecations').checkForDeprecations;
+const handleUncaughtExceptions = require('gemini/lib/cli/errors').handleUncaughtExceptions;
+
+function exit(code) {
+    process.exit(code);
+}
+
+function promiseTry(func) {
+    return new Promise(resolve => resolve(func()));
+}
+
+function runGemini(paths = []) {
+    handleUncaughtExceptions();
+
+    return promiseTry(() => {
+        checkForDeprecations();
+
+        const gemini = new Gemini();
+        gemini.on(Events.INTERRUPT, (data) => { exit(data.exitCode); });
+
+        return gemini;
+    })
+        .then(gemini => gemini.test(paths, { reporters: [{ name: 'flat' }] }))
+        .then(stats => stats.failed > 0 ? 2 : 0)
+        .catch(handleErrors)
+        .then(exit);
+}
+
+runGemini();
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "arui-feather",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "Alfa-Bank UI lightweight library",
   "repository": {
     "type": "git",
@@ -13,9 +13,9 @@
     "lint-js": "eslint ./*.js ./src/ ./demo/ ./gemini/ ./arui-demo/components --ext .js,.jsx",
     "lint-md": "eslint -c .eslintrc.styleguide.js ./src/ --ext .md",
     "lint-css": "stylelint ./src/**/*.css ./arui-demo/**/*.css",
-    "gemini": "gemini test --reporter html --reporter flat --grep=`env | grep '^SUITES' | awk -F= '{print $NF}'`",
+    "gemini": "gemini test --grep=`env | grep '^SUITES' | awk -F= '{print $NF}'`",
+    "gemini-ci": "node ./gemini-utils/gemini-ci.js",
     "gemini-update": "ALL_SIZES=1 gemini update --grep=`env | grep '^SUITES' | awk -F= '{print $NF}'`",
-    "gemini-ci": "run-p -r gemini",
     "build": "webpack",
     "_changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
     "release-patch": "npm version patch -m 'chore(*): patch version'",
@@ -121,6 +121,7 @@
     "gemini-react": "^0.11.0",
     "gemini-saucelabs-info": "^1.0.0",
     "gulp": "^3.9.1",
+    "html-reporter": "^0.2.0",
     "husky": "^0.13.3",
     "isparta-loader": "^2.0.0",
     "istanbul": "^0.4.2",
@@ -140,7 +141,6 @@
     "lint-staged": "^3.6.1",
     "mocha": "^3.4.2",
     "node-noop": "^1.0.0",
-    "npm-run-all": "^4.0.2",
     "react-docgen": "^2.15.0",
     "react-frame-component": "^1.1.0",
     "react-hot-loader": "3.0.0-beta.1",

diff --git a/src/input/fantasy/input.css b/src/input/fantasy/input.css
@@ -442,21 +442,3 @@
         line-height: 58px;
     }
 }
-
-.input.input_invalid {
-    .input__top,
-    .input__sub {
-        color: var(--color-error);
-    }
-
-    .input__box {
-        border-bottom-color: var(--color-error-translucent);
-    }
-
-    &.input_focused {
-        .input__box {
-            border-bottom-color: var(--color-error-translucent);
-            box-shadow: inset 0 -1px 0 var(--color-error-translucent);
-        }
-    }
-}
diff --git a/src/input/fantasy/input_theme_alfa-on-color.css b/src/input/fantasy/input_theme_alfa-on-color.css
@@ -64,6 +64,24 @@
         }
     }
 
+    &.input_invalid {
+        .input__top,
+        .input__sub {
+            color: var(--color-error);
+        }
+
+        .input__box {
+            border-bottom-color: var(--color-error-translucent);
+        }
+
+        &.input_focused {
+            .input__box {
+                border-bottom-color: var(--color-error-translucent);
+                box-shadow: inset 0 -1px 0 var(--color-error-translucent);
+            }
+        }
+    }
+
     &.input_size_s .input__clear,
     &.input_size_m .input__clear {
         background-size: 10px;

diff --git a/src/input/fantasy/input_theme_alfa-on-white.css b/src/input/fantasy/input_theme_alfa-on-white.css
@@ -64,6 +64,24 @@
         }
     }
 
+    &.input_invalid {
+        .input__top,
+        .input__sub {
+            color: var(--color-error);
+        }
+
+        .input__box {
+            border-bottom-color: var(--color-error-translucent);
+        }
+
+        &.input_focused {
+            .input__box {
+                border-bottom-color: var(--color-error-translucent);
+                box-shadow: inset 0 -1px 0 var(--color-error-translucent);
+            }
+        }
+    }
+
     &.input_size_s .input__clear,
     &.input_size_m .input__clear {
         background-size: 10px;

diff --git a/src/link/fantasy/link.css b/src/link/fantasy/link.css
@@ -81,7 +81,7 @@
         color: var(--color-content-accent-alfa-on-color);
 
         .link__text {
-            border-color: rgba(255, 255, 255, 1);
+            border-color: rgba(--color-content-accent-alfa-on-color);
         }
     }
 
@@ -99,10 +99,10 @@
 
     &.link_hovered,
     &.link_focused {
-        color: var(--color-content-heavy-accent-alfa-on-white);
+        color: var(--color-content-accent-alfa-on-white);
 
         .link__text {
-            border-color: var(--color-accent-translucent);
+            border-color: var(--color-content-accent-alfa-on-white);
         }
     }
 

diff --git a/src/select/fantasy/select.css b/src/select/fantasy/select.css
@@ -246,9 +246,3 @@
         }
     }
 }
-
-.select.select_invalid {
-    .select__sub {
-        color: var(--color-error);
-    }
-}
diff --git a/src/select/fantasy/select_theme_alfa-on-color.css b/src/select/fantasy/select_theme_alfa-on-color.css
@@ -56,6 +56,10 @@
     }
 
     &.select_invalid {
+        .select__sub {
+            color: var(--color-error);
+        }
+
         .select-button {
             border-bottom-color: var(--color-error-translucent);
         }

diff --git a/src/select/fantasy/select_theme_alfa-on-white.css b/src/select/fantasy/select_theme_alfa-on-white.css
@@ -56,6 +56,10 @@
     }
 
     &.select_invalid {
+        .select__sub {
+            color: var(--color-error);
+        }
+
         .select-button {
             border-bottom-color: var(--color-error-translucent);
         }

diff --git a/src/textarea/fantasy/textarea.css b/src/textarea/fantasy/textarea.css
@@ -259,21 +259,3 @@
         }
     }
 }
-
-.textarea.textarea_invalid {
-    .textarea__top,
-    .textarea__sub {
-        color: var(--color-error);
-    }
-
-    .textarea__control {
-        border-bottom-color: var(--color-error-translucent);
-    }
-
-    &.textarea_focused {
-        .textarea__control {
-            border-bottom-color: var(--color-error-translucent);
-            box-shadow: inset 0 -1px 0 var(--color-error-translucent);
-        }
-    }
-}
diff --git a/src/textarea/fantasy/textarea_theme_alfa-on-color.css b/src/textarea/fantasy/textarea_theme_alfa-on-color.css
@@ -41,4 +41,22 @@
             border-bottom-style: dotted;
         }
     }
+
+    &.textarea_invalid {
+        .textarea__top,
+        .textarea__sub {
+            color: var(--color-error);
+        }
+
+        .textarea__control {
+            border-bottom-color: var(--color-error-translucent);
+        }
+
+        &.textarea_focused {
+            .textarea__control {
+                border-bottom-color: var(--color-error-translucent);
+                box-shadow: inset 0 -1px 0 var(--color-error-translucent);
+            }
+        }
+    }
 }
diff --git a/src/textarea/fantasy/textarea_theme_alfa-on-white.css b/src/textarea/fantasy/textarea_theme_alfa-on-white.css
@@ -41,4 +41,22 @@
             border-bottom-style: dotted;
         }
     }
+
+    &.textarea_invalid {
+        .textarea__top,
+        .textarea__sub {
+            color: var(--color-error);
+        }
+
+        .textarea__control {
+            border-bottom-color: var(--color-error-translucent);
+        }
+
+        &.textarea_focused {
+            .textarea__control {
+                border-bottom-color: var(--color-error-translucent);
+                box-shadow: inset 0 -1px 0 var(--color-error-translucent);
+            }
+        }
+    }
 }