Merge branch 'master' into skip-param

oblador · Jun 11, 2020 · 0240db5 · 0240db5
2 parents 4b48306 + 8f5f5fe
commit 0240db5
Show file tree

Hide file tree

Showing 46 changed files with 684 additions and 86 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,75 @@
+name: Tests
+
+on: [push]
+
+jobs:
+  unit:
+    name: Unit tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+      - name: Install dependencies
+        run: yarn --frozen-lockfile --non-interactive --silent --ignore-scripts
+      - name: Run Jest
+        uses: tangro/actions-test@1.1.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        with:
+          command: test-ci
+
+  static-analysis:
+    name: Static analysis
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+      - name: Install dependencies
+        run: yarn --frozen-lockfile --non-interactive --silent --ignore-scripts
+      - name: Run ESLint
+        run: yarn lint
+
+  integration-cli:
+    name: 'Integration tests: CLI'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+      - name: Install dependencies
+        run: yarn --frozen-lockfile --non-interactive --silent --ignore-scripts
+      - name: Run integration tests
+        run: yarn workspace @loki/test-cli test
+
+  visual-react-dom:
+    name: 'Visual tests: React DOM'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+      - name: Install dependencies
+        run: yarn --frozen-lockfile --non-interactive --silent --ignore-scripts
+      - name: Run loki
+        run: yarn workspace @loki/example-react test-ci
+      - name: Archive screenshots
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v1
+        with:
+          name: screenshots
+          path: examples/react/.loki
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ yarn-error.log
 _book
 .loki
 !examples/*/.loki
+test_results.json
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -38,7 +38,7 @@ Example `package.json`:
 }
 ```
 
-You may also use a file named `.lokirc`, `.lokirc.json` or `loki.config.js` if you don't want to pollute your `package.json`.
+You may also use a file named `.lokirc`, `.lokirc.json` or `loki.config.js` (see the react example) if you don't want to pollute your `package.json`.
 
 ## `chromeSelector`
 

diff --git a/examples/react/.loki/reference/chrome_a4_FocusedInput_default.png b/examples/react/.loki/reference/chrome_a4_FocusedInput_default.png
diff --git a/examples/react/.loki/reference/chrome_a4_Positions_Absolute.png b/examples/react/.loki/reference/chrome_a4_Positions_Absolute.png
diff --git a/examples/react/.loki/reference/chrome_a4_Positions_Fixed.png b/examples/react/.loki/reference/chrome_a4_Positions_Fixed.png
diff --git a/examples/react/.loki/reference/chrome_a4_Positions_Nested.png b/examples/react/.loki/reference/chrome_a4_Positions_Nested.png
diff --git a/examples/react/.loki/reference/chrome_a4_Positions_Nested_Overflow_Hidden.png b/examples/react/.loki/reference/chrome_a4_Positions_Nested_Overflow_Hidden.png
diff --git a/examples/react/.loki/reference/chrome_a4_Positions_Overflow_Hidden_Fixed.png b/examples/react/.loki/reference/chrome_a4_Positions_Overflow_Hidden_Fixed.png
diff --git a/examples/react/.loki/reference/chrome_a4_Positions_Overflow_Hidden_Relative.png b/examples/react/.loki/reference/chrome_a4_Positions_Overflow_Hidden_Relative.png
diff --git a/examples/react/.loki/reference/chrome_a4_Positions_Relative_Wrapper.png b/examples/react/.loki/reference/chrome_a4_Positions_Relative_Wrapper.png
diff --git a/examples/react/.loki/reference/chrome_a4_Positions_Slider_With_Nested_Overflow.png b/examples/react/.loki/reference/chrome_a4_Positions_Slider_With_Nested_Overflow.png
diff --git a/examples/react/.loki/reference/chrome_iphone7_FocusedInput_default.png b/examples/react/.loki/reference/chrome_iphone7_FocusedInput_default.png
diff --git a/examples/react/.loki/reference/chrome_iphone7_Positions_Absolute.png b/examples/react/.loki/reference/chrome_iphone7_Positions_Absolute.png
diff --git a/examples/react/.loki/reference/chrome_iphone7_Positions_Fixed.png b/examples/react/.loki/reference/chrome_iphone7_Positions_Fixed.png
diff --git a/examples/react/.loki/reference/chrome_iphone7_Positions_Nested.png b/examples/react/.loki/reference/chrome_iphone7_Positions_Nested.png
diff --git a/examples/react/.loki/reference/chrome_iphone7_Positions_Nested_Overflow_Hidden.png b/examples/react/.loki/reference/chrome_iphone7_Positions_Nested_Overflow_Hidden.png
diff --git a/examples/react/.loki/reference/chrome_iphone7_Positions_Overflow_Hidden_Fixed.png b/examples/react/.loki/reference/chrome_iphone7_Positions_Overflow_Hidden_Fixed.png
diff --git a/...les/react/.loki/reference/chrome_iphone7_Positions_Overflow_Hidden_Relative.png b/...les/react/.loki/reference/chrome_iphone7_Positions_Overflow_Hidden_Relative.png
diff --git a/examples/react/.loki/reference/chrome_iphone7_Positions_Relative_Wrapper.png b/examples/react/.loki/reference/chrome_iphone7_Positions_Relative_Wrapper.png
diff --git a/.../react/.loki/reference/chrome_iphone7_Positions_Slider_With_Nested_Overflow.png b/.../react/.loki/reference/chrome_iphone7_Positions_Slider_With_Nested_Overflow.png
diff --git a/examples/react/.loki/reference/chrome_laptop_FocusedInput_default.png b/examples/react/.loki/reference/chrome_laptop_FocusedInput_default.png
diff --git a/examples/react/.loki/reference/chrome_laptop_Positions_Absolute.png b/examples/react/.loki/reference/chrome_laptop_Positions_Absolute.png
diff --git a/examples/react/.loki/reference/chrome_laptop_Positions_Fixed.png b/examples/react/.loki/reference/chrome_laptop_Positions_Fixed.png
diff --git a/examples/react/.loki/reference/chrome_laptop_Positions_Nested.png b/examples/react/.loki/reference/chrome_laptop_Positions_Nested.png
diff --git a/examples/react/.loki/reference/chrome_laptop_Positions_Nested_Overflow_Hidden.png b/examples/react/.loki/reference/chrome_laptop_Positions_Nested_Overflow_Hidden.png
diff --git a/examples/react/.loki/reference/chrome_laptop_Positions_Overflow_Hidden_Fixed.png b/examples/react/.loki/reference/chrome_laptop_Positions_Overflow_Hidden_Fixed.png
diff --git a/...ples/react/.loki/reference/chrome_laptop_Positions_Overflow_Hidden_Relative.png b/...ples/react/.loki/reference/chrome_laptop_Positions_Overflow_Hidden_Relative.png
diff --git a/examples/react/.loki/reference/chrome_laptop_Positions_Relative_Wrapper.png b/examples/react/.loki/reference/chrome_laptop_Positions_Relative_Wrapper.png
diff --git a/...s/react/.loki/reference/chrome_laptop_Positions_Slider_With_Nested_Overflow.png b/...s/react/.loki/reference/chrome_laptop_Positions_Slider_With_Nested_Overflow.png
diff --git a/examples/react/loki.config.js b/examples/react/loki.config.js
@@ -0,0 +1,20 @@
+module.exports = {
+  "chromeSelector": ".wrapper > *, #root > *",
+  "diffingEngine": "looks-same",
+  "configurations": {
+    "chrome.laptop": {
+      "target": "chrome.docker",
+      "width": 1366,
+      "height": 768
+    },
+    "chrome.iphone7": {
+      "target": "chrome.docker",
+      "preset": "iPhone 7"
+    },
+    "chrome.a4": {
+      "target": "chrome.docker",
+      "preset": "A4 Paper"
+    }
+  },
+  "fetchFailIgnore": "localhost:1234/get"
+};
diff --git a/examples/react/package.json b/examples/react/package.json
@@ -29,26 +29,6 @@
     "@storybook/react": "^5.3.13",
     "loki": "^0.20.3"
   },
-  "loki": {
-    "chromeSelector": ".wrapper > *, #root > *",
-    "diffingEngine": "looks-same",
-    "configurations": {
-      "chrome.laptop": {
-        "target": "chrome.docker",
-        "width": 1366,
-        "height": 768
-      },
-      "chrome.iphone7": {
-        "target": "chrome.docker",
-        "preset": "iPhone 7"
-      },
-      "chrome.a4": {
-        "target": "chrome.docker",
-        "preset": "A4 Paper"
-      }
-    },
-    "fetchFailIgnore": "localhost:1234/get"
-  },
   "eslintConfig": {
     "extends": "react-app"
   },

diff --git a/examples/react/src/FocusedInput.js b/examples/react/src/FocusedInput.js
@@ -0,0 +1,5 @@
+import React from 'react';
+
+const FocusedInput = () => <input type="text" autoFocus />;
+
+export default FocusedInput;