Use reusable executors (#1763)

.circleci/config.yml

@@ -1,5 +1,18 @@
 version: 2.1
 
+executors:
+  firefox:
+    docker:
+      - image: circleci/node:6
+      - image: selenium/standalone-firefox:2.48.2
+  chrome:
+    docker:
+      - image: circleci/node:6
+      - image: selenium/standalone-chrome:2.48.2
+        environment:
+          # workaround for https://github.com/SeleniumHQ/docker-selenium/issues/87
+          DBUS_SESSION_BUS_ADDRESS: /dev/null
+
 commands:
   checkout_repo:
     steps:
@@ -64,26 +77,6 @@ commands:
           # do not upload if screenshotter tests are skipped
           command: ./node_modules/.bin/codecov -F "<< parameters.flag >>"
 
-  screenshotter:
-    steps:
-      - checkout_repo
-      - skip_if_only_changed:
-          filter: '^docs/|^static/|^website/|^LICENSE|\.md$'
-      - install_dependencies
-
-      - run:
-          name: Verify screenshots and generate diffs and new screenshots
-          command: node dockers/screenshotter/screenshotter.js --selenium-ip localhost -b $CIRCLE_JOB --verify --diff --new --coverage
-      - codecov:
-          flag: screenshotter
-
-      - store_artifacts:
-          path: test/screenshotter/new
-          destination: new
-      - store_artifacts:
-          path: test/screenshotter/diff
-          destination: diff
-
 jobs:
   test:
     docker:
@@ -115,26 +108,36 @@ jobs:
       - codecov:
           flag: test
 
-  firefox:
+  screenshotter:
-    docker:
+    parameters:
-      - image: circleci/node:6
+      browser:
-      - image: selenium/standalone-firefox:2.48.2
+        type: executor
+    executor: << parameters.browser >>
     steps:
-      - screenshotter
+      - checkout_repo
+      - skip_if_only_changed:
+          filter: '^docs/|^static/|^website/|^LICENSE|\.md$'
+      - install_dependencies
 
-  chrome:
+      - run:
-    docker:
+          name: Verify screenshots and generate diffs and new screenshots
-      - image: circleci/node:6
+          command: node dockers/screenshotter/screenshotter.js --selenium-ip localhost -b $CIRCLE_JOB --verify --diff --new --coverage
-      - image: selenium/standalone-chrome:2.48.2
+      - codecov:
-        environment:
+          flag: screenshotter
-          # workaround for https://github.com/SeleniumHQ/docker-selenium/issues/87
+      - store_artifacts:
-          DBUS_SESSION_BUS_ADDRESS: /dev/null
+          path: test/screenshotter/new
-    steps:
+          destination: new
-      - screenshotter
+      - store_artifacts:
+          path: test/screenshotter/diff
+          destination: diff
 
 workflows:
   test:
     jobs:
       - test
-      - firefox
+      - screenshotter:
-      - chrome
+          name: firefox
+          browser: firefox
+      - screenshotter:
+          name: chrome
+          browser: chrome