From 5c757f0e0005aec28119d551cd765b194a781d53 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Fri, 1 Jul 2016 10:38:27 -0700
Subject: [PATCH 01/74] Pass engagementButtonLabel to showHeartbeat properly.

---
 .../control/js/components/RecipePreview.js    |  5 +-
 .../selfrepair/static/js/normandy_driver.js   | 87 ++++++++++---------
 normandy/selfrepair/static/js/self_repair.js  | 12 ++-
 .../static/js/self_repair_runner.js           | 29 +++----
 .../selfrepair/tests/test_normandy_driver.js  | 38 ++++++++
 webpack.config.js                             |  1 +
 6 files changed, 111 insertions(+), 61 deletions(-)
 create mode 100644 normandy/selfrepair/tests/test_normandy_driver.js

diff --git a/normandy/control/static/control/js/components/RecipePreview.js b/normandy/control/static/control/js/components/RecipePreview.js
index 3302d14b..e457efda 100644
--- a/normandy/control/static/control/js/components/RecipePreview.js
+++ b/normandy/control/static/control/js/components/RecipePreview.js
@@ -2,6 +2,7 @@ import React, { PropTypes as pt } from 'react';
 import classNames from 'classnames';
 import composeRecipeContainer from './RecipeContainer.js';
 import { runRecipe } from '../../../../../selfrepair/static/js/self_repair_runner.js';
+import NormandyDriver from '../../../../../selfrepair/static/js/normandy_driver.js';
 
 class RecipePreview extends React.Component {
   propTypes = {
@@ -29,13 +30,15 @@ class RecipePreview extends React.Component {
   attemptPreview() {
     const { recipe } = this.props;
     const { recipeAttempted } = this.state;
+    const driver = new NormandyDriver();
+    driver.registerCallbacks();
 
     if (recipe && !recipeAttempted) {
       this.setState({
         recipeAttempted: true,
       });
 
-      runRecipe(recipe, { testing: true }).then(() => {
+      runRecipe(recipe, driver, { testing: true }).then(() => {
         this.setState({
           recipeExecuted: true,
         });
diff --git a/normandy/selfrepair/static/js/normandy_driver.js b/normandy/selfrepair/static/js/normandy_driver.js
index fe985338..dce27765 100644
--- a/normandy/selfrepair/static/js/normandy_driver.js
+++ b/normandy/selfrepair/static/js/normandy_driver.js
@@ -40,21 +40,40 @@ Object.assign(LocalStorage.prototype, {
 /**
  * Implementation of the Normandy driver.
  */
-const Normandy = {
-  locale: document.documentElement.dataset.locale || navigator.language,
+export default class NormandyDriver {
+  constructor(uitour=Mozilla.UITour) {
+      this._uitour = uitour;
+  }
 
-  _testingOverride: false,
+  _heartbeatCallbacks = [];
+  registerCallbacks() {
+    // Trigger heartbeat callbacks when the UITour tells us that Heartbeat
+    // happened.
+    this._uitour.observe((eventName, data) => {
+      if (eventName.startsWith('Heartbeat:')) {
+        const flowId = data.flowId;
+        const croppedEventName = eventName.slice(10); // Chop off "Heartbeat:"
+        if (flowId in this._heartbeatCallbacks) {
+          this._heartbeatCallbacks[flowId](croppedEventName, data);
+        }
+      }
+    });
+  }
+
+  locale = document.documentElement.dataset.locale || navigator.language;
+
+  _testingOverride = false;
   get testing() {
     return this._testingOverride || new URL(window.location.href).searchParams.has('testing');
-  },
+  }
   set testing(value) {
     this._testingOverride = value;
-  },
+  }
 
-  _location: { countryCode: null },
+  _location = { countryCode: null };
   location() {
     return Promise.resolve(this._location);
-  },
+  }
 
   log(message, level = 'debug') {
     if (level === 'debug' && !this.testing) {
@@ -64,15 +83,15 @@ const Normandy = {
     } else {
       console.log(message);
     }
-  },
+  }
 
   uuid() {
     return uuid.v4();
-  },
+  }
 
   createStorage(prefix) {
     return new LocalStorage(prefix);
-  },
+  }
 
   client() {
     return new Promise(resolve => {
@@ -80,7 +99,7 @@ const Normandy = {
         plugins: {},
       };
 
-            // Populate plugin info.
+      // Populate plugin info.
       for (const plugin of navigator.plugins) {
         client.plugins[plugin.name] = {
           name: plugin.name,
@@ -109,7 +128,7 @@ const Normandy = {
       let retrievedConfigs = 0;
       const wantedConfigNames = Object.keys(wantedConfigs);
       wantedConfigNames.forEach(configName => {
-        Mozilla.UITour.getConfiguration(configName, data => {
+        this._uitour.getConfiguration(configName, data => {
           wantedConfigs[configName](data);
           retrievedConfigs++;
           if (retrievedConfigs >= wantedConfigNames.length) {
@@ -118,7 +137,7 @@ const Normandy = {
         });
       });
     });
-  },
+  }
 
   saveHeartbeatFlow(data) {
     if (this.testing) {
@@ -134,46 +153,32 @@ const Normandy = {
         'Content-Type': 'application/json',
       },
     });
-  },
+  }
 
-  heartbeatCallbacks: [],
+  heartbeatCallbacks = [];
   showHeartbeat(options) {
     return new Promise(resolve => {
       const emitter = new EventEmitter();
       this.heartbeatCallbacks[options.flowId] = (eventName, data) => emitter.emit(eventName, data);
 
-            // Positional arguments are overridden by the final options
-            // argument, but they're still required so we pass them anyway.
-      Mozilla.UITour.showHeartbeat(
-                options.message,
-                options.thanksMessage,
-                options.flowId,
-                options.postAnswerUrl,
-                options.learnMoreMessage,
-                options.learnMoreUrl,
+      // Positional arguments are overridden by the final options
+      // argument, but they're still required so we pass them anyway.
+      this._uitour.showHeartbeat(
+        options.message,
+        options.thanksMessage,
+        options.flowId,
+        options.postAnswerUrl,
+        options.learnMoreMessage,
+        options.learnMoreUrl,
         {
+          engagementButtonLabel: options.engagementButtonLabel,
           surveyId: options.surveyId,
           surveyVersion: options.surveyVersion,
           testing: options.testing,
         }
-            );
+      );
 
       resolve(emitter);
     });
-  },
-};
-
-
-// Trigger heartbeat callbacks when the UITour tells us that Heartbeat
-// happened.
-Mozilla.UITour.observe((eventName, data) => {
-  if (eventName.startsWith('Heartbeat:')) {
-    const flowId = data.flowId;
-    const croppedEventName = eventName.slice(10); // Chop off "Heartbeat:"
-    if (flowId in Normandy.heartbeatCallbacks) {
-      Normandy.heartbeatCallbacks[flowId](croppedEventName, data);
-    }
   }
-});
-
-export default Normandy;
+}
diff --git a/normandy/selfrepair/static/js/self_repair.js b/normandy/selfrepair/static/js/self_repair.js
index e54c869a..d794f73c 100644
--- a/normandy/selfrepair/static/js/self_repair.js
+++ b/normandy/selfrepair/static/js/self_repair.js
@@ -1,16 +1,20 @@
-import Normandy from './normandy_driver.js';
+import Mozilla from './uitour.js';
+import NormandyDriver from './normandy_driver.js';
 import { fetchRecipes, filterContext, doesRecipeMatch, runRecipe } from './self_repair_runner.js';
 
+const driver = new NormandyDriver(Mozilla.UITour);
+driver.registerCallbacks();
+
 // Actually fetch and run the recipes.
 fetchRecipes().then(recipes => {
-  filterContext().then(context => {
+  filterContext(driver).then(context => {
     // Update Normandy driver with user's country.
-    Normandy._location.countryCode = context.normandy.country;
+    driver._location.countryCode = context.normandy.country;
 
     for (const recipe of recipes) {
       doesRecipeMatch(recipe, context).then(([, match]) => {
         if (match) {
-          runRecipe(recipe).catch(err => {
+          runRecipe(recipe, driver).catch(err => {
             console.error(err);
           });
         }
diff --git a/normandy/selfrepair/static/js/self_repair_runner.js b/normandy/selfrepair/static/js/self_repair_runner.js
index 5b2d7fb7..7c6c5099 100644
--- a/normandy/selfrepair/static/js/self_repair_runner.js
+++ b/normandy/selfrepair/static/js/self_repair_runner.js
@@ -1,4 +1,3 @@
-import Normandy from './normandy_driver.js';
 import uuid from 'node-uuid';
 import jexl from 'jexl';
 
@@ -78,22 +77,22 @@ export function fetchRecipes() {
  * Fetch client information from the Normandy server and the driver.
  * @promise Resolves with an object containing client info.
  */
-function classifyClient() {
+function classifyClient(driver) {
   const { classifyUrl } = document.documentElement.dataset;
   const headers = { Accept: 'application/json' };
   const classifyXhr = fetch(classifyUrl, { headers })
     .then(response => response.json())
     .then(client => client);
 
-  return Promise.all([classifyXhr, Normandy.client()])
-    .then(([classification, client]) => {
-        // Parse request time
-      classification.request_time = new Date(classification.request_time);
+  return Promise.all([classifyXhr, driver.client()])
+  .then(([classification, client]) => {
+      // Parse request time
+    classification.request_time = new Date(classification.request_time);
 
-      return Object.assign({
-        locale: Normandy.locale,
-      }, classification, client);
-    });
+    return Object.assign({
+      locale: driver.locale,
+    }, classification, client);
+  });
 }
 
 
@@ -103,13 +102,13 @@ function classifyClient() {
  * @param {Recipe} recipe - Recipe retrieved from the server.
  * @promise Resolves once the action has executed.
  */
-export function runRecipe(recipe, options = {}) {
+export function runRecipe(recipe, driver, options = {}) {
   return loadAction(recipe).then(Action => {
     if (options.testing !== undefined) {
-      Normandy.testing = options.testing;
+      driver.testing = options.testing;
     }
 
-    return new Action(Normandy, recipe).execute();
+    return new Action(driver, recipe).execute();
   });
 }
 
@@ -118,8 +117,8 @@ export function runRecipe(recipe, options = {}) {
  * Generate a context object for JEXL filter expressions.
  * @return {object}
  */
-export function filterContext() {
-  return classifyClient()
+export function filterContext(driver) {
+  return classifyClient(driver)
   .then(classifiedClient => ({
     normandy: classifiedClient,
   }));
diff --git a/normandy/selfrepair/tests/test_normandy_driver.js b/normandy/selfrepair/tests/test_normandy_driver.js
new file mode 100644
index 00000000..19deaea7
--- /dev/null
+++ b/normandy/selfrepair/tests/test_normandy_driver.js
@@ -0,0 +1,38 @@
+import NormandyDriver from '../static/js/normandy_driver.js';
+
+describe('Normandy Driver', () => {
+  describe('showHeartbeat', () => {
+    it('should pass all the required arguments to the UITour helper', async function() {
+      let uitour = jasmine.createSpyObj('uitour', ['showHeartbeat']);
+      let driver = new NormandyDriver(uitour);
+      let options = {
+        message: 'testMessage',
+        thanksMessage: 'testThanks',
+        flowId: 'testFlowId',
+        postAnswerUrl: 'testPostAnswerUrl',
+        learnMoreMessage: 'testLearnMoreMessage',
+        learnMoreUrl: 'testLearnMoreUrl',
+        engagementButtonLabel: 'testEngagementButtonLabel',
+        surveyId: 'testSurveyId',
+        surveyVersion: 'testSurveyVersion',
+        testing: true
+      };
+
+      await driver.showHeartbeat(options);
+      expect(uitour.showHeartbeat).toHaveBeenCalledWith(
+        options.message,
+        options.thanksMessage,
+        options.flowId,
+        options.postAnswerUrl,
+        options.learnMoreMessage,
+        options.learnMoreUrl,
+        jasmine.objectContaining({
+          engagementButtonLabel: options.engagementButtonLabel,
+          surveyId: options.surveyId,
+          surveyVersion: options.surveyVersion,
+          testing: options.testing,
+        }),
+      );
+    });
+  });
+});
diff --git a/webpack.config.js b/webpack.config.js
index a8144e12..e892ba8e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -20,6 +20,7 @@ module.exports = [
         './normandy/selfrepair/static/js/self_repair',
       ],
       control: [
+        'babel-polyfill',
         './normandy/control/static/control/js/index',
         './normandy/control/static/control/admin/sass/control.scss',
         './node_modules/font-awesome/scss/font-awesome.scss',

From fa7050316962fbfd83115f308ac80411941c8626 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Fri, 1 Jul 2016 10:39:38 -0700
Subject: [PATCH 02/74] Refactor LocalStorage to ES6 class syntax.

---
 .../selfrepair/static/js/normandy_driver.js   | 43 ++++++++-----------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/normandy/selfrepair/static/js/normandy_driver.js b/normandy/selfrepair/static/js/normandy_driver.js
index dce27765..0d134d5f 100644
--- a/normandy/selfrepair/static/js/normandy_driver.js
+++ b/normandy/selfrepair/static/js/normandy_driver.js
@@ -4,38 +4,31 @@ import uuid from 'node-uuid';
 
 /**
  * Storage class that uses window.localStorage as it's backing store.
- * @param {string} prefix Prefix to append to all incoming keys.
  */
-function LocalStorage(prefix) {
-  this.prefix = prefix;
-}
+class LocalStorage {
+  /**
+   * @param    {string} prefix Prefix to append to all incoming keys.
+   */
+  constructor(prefix) {
+    this.prefix = prefix;
+  }
 
-Object.assign(LocalStorage.prototype, {
   _makeKey(key) {
     return `${this.prefix}-${key}`;
-  },
+  }
 
-  getItem(key) {
-    return new Promise(resolve => {
-      resolve(localStorage.getItem(this._makeKey(key)));
-    });
-  },
+  async getItem(key) {
+    return localStorage.getItem(this._makeKey(key));
+  }
 
-  setItem(key, value) {
-    return new Promise(resolve => {
-      localStorage.setItem(this._makeKey(key), value);
-      resolve();
-    });
-  },
-
-  removeItem(key) {
-    return new Promise(resolve => {
-      localStorage.removeItem(this._makeKey(key));
-      resolve();
-    });
-  },
-});
+  async setItem(key, value) {
+    return localStorage.setItem(this._makeKey(key), value);
+  }
 
+  async removeItem(key) {
+    return localStorage.removeItem(this._makeKey(key));
+  }
+}
 
 /**
  * Implementation of the Normandy driver.

From 827439e4656676575f0db0a1e4f36dd5188297a4 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Wed, 6 Jul 2016 21:58:55 -0700
Subject: [PATCH 03/74] Lint fixes.

---
 normandy/selfrepair/static/js/normandy_driver.js  |  4 ++--
 normandy/selfrepair/tests/test_normandy_driver.js | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/normandy/selfrepair/static/js/normandy_driver.js b/normandy/selfrepair/static/js/normandy_driver.js
index 0d134d5f..ff49e9bb 100644
--- a/normandy/selfrepair/static/js/normandy_driver.js
+++ b/normandy/selfrepair/static/js/normandy_driver.js
@@ -34,8 +34,8 @@ class LocalStorage {
  * Implementation of the Normandy driver.
  */
 export default class NormandyDriver {
-  constructor(uitour=Mozilla.UITour) {
-      this._uitour = uitour;
+  constructor(uitour = Mozilla.UITour) {
+    this._uitour = uitour;
   }
 
   _heartbeatCallbacks = [];
diff --git a/normandy/selfrepair/tests/test_normandy_driver.js b/normandy/selfrepair/tests/test_normandy_driver.js
index 19deaea7..08f4c043 100644
--- a/normandy/selfrepair/tests/test_normandy_driver.js
+++ b/normandy/selfrepair/tests/test_normandy_driver.js
@@ -2,10 +2,10 @@ import NormandyDriver from '../static/js/normandy_driver.js';
 
 describe('Normandy Driver', () => {
   describe('showHeartbeat', () => {
-    it('should pass all the required arguments to the UITour helper', async function() {
-      let uitour = jasmine.createSpyObj('uitour', ['showHeartbeat']);
-      let driver = new NormandyDriver(uitour);
-      let options = {
+    it('should pass all the required arguments to the UITour helper', async () => {
+      const uitour = jasmine.createSpyObj('uitour', ['showHeartbeat']);
+      const driver = new NormandyDriver(uitour);
+      const options = {
         message: 'testMessage',
         thanksMessage: 'testThanks',
         flowId: 'testFlowId',
@@ -15,7 +15,7 @@ describe('Normandy Driver', () => {
         engagementButtonLabel: 'testEngagementButtonLabel',
         surveyId: 'testSurveyId',
         surveyVersion: 'testSurveyVersion',
-        testing: true
+        testing: true,
       };
 
       await driver.showHeartbeat(options);

From 3ffa2daeb553f070828634c75d80c256271813e1 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Wed, 6 Jul 2016 22:00:08 -0700
Subject: [PATCH 04/74] Review fixes.

---
 normandy/selfrepair/static/js/self_repair.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/normandy/selfrepair/static/js/self_repair.js b/normandy/selfrepair/static/js/self_repair.js
index d794f73c..c6319b68 100644
--- a/normandy/selfrepair/static/js/self_repair.js
+++ b/normandy/selfrepair/static/js/self_repair.js
@@ -1,8 +1,7 @@
-import Mozilla from './uitour.js';
 import NormandyDriver from './normandy_driver.js';
 import { fetchRecipes, filterContext, doesRecipeMatch, runRecipe } from './self_repair_runner.js';
 
-const driver = new NormandyDriver(Mozilla.UITour);
+const driver = new NormandyDriver();
 driver.registerCallbacks();
 
 // Actually fetch and run the recipes.

From b52b15a759a4d65d815fca8b2b0b591d3b7eb0cf Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Thu, 7 Jul 2016 16:10:13 -0700
Subject: [PATCH 05/74] Fix errors introduced during linting

Fixes bug 1271278.
---
 .../control/tests/actions/controlActions.js     | 17 +++++++++++++++++
 normandy/recipes/static/js/arguments_editor.js  | 10 +++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/normandy/control/tests/actions/controlActions.js b/normandy/control/tests/actions/controlActions.js
index 6e1510f6..1cfb899d 100644
--- a/normandy/control/tests/actions/controlActions.js
+++ b/normandy/control/tests/actions/controlActions.js
@@ -124,4 +124,21 @@ describe('controlApp Actions', () => {
       expect(fetchMock.calls('/api/v1/recipe/1/').length).toEqual(1);
     });
   });
+
+
+  describe('showNotification', () => {
+    it('automatically dismisses notifications after 10 seconds', async () => {
+      jasmine.clock().install();
+
+      const notification = { messageType: 'success', message: 'message' };
+      await store.dispatch(actionTypes.showNotification(notification));
+
+      const dismissAction = actionTypes.dismissNotification(notification.id);
+      expect(store.getActions()).not.toContain(dismissAction);
+      jasmine.clock().tick(10001);
+      expect(store.getActions()).toContain(dismissAction);
+
+      jasmine.clock().uninstall();
+    });
+  });
 });
diff --git a/normandy/recipes/static/js/arguments_editor.js b/normandy/recipes/static/js/arguments_editor.js
index 94dab202..e59735a7 100644
--- a/normandy/recipes/static/js/arguments_editor.js
+++ b/normandy/recipes/static/js/arguments_editor.js
@@ -10,18 +10,18 @@
     var $editorElement = $('<div class="arguments-editor"></div>');
     var editor = null;
 
-        // Insert editor next to field.
+    // Insert editor next to field.
     $editorElement.insertBefore($argumentsJson);
 
-        // Update the backing textarea before submitting.
+    // Update the backing textarea before submitting.
     $actionSelect.parents('form').submit(function storeValue() {
       if (editor !== null) {
         $argumentsJson.val(JSON.stringify(editor.getValue()));
       }
     });
 
-        // When the action type changes, remove the existing editor and
-        // create a new one.
+    // When the action type changes, remove the existing editor and
+    // create a new one.
     $actionSelect.change(function handleChange() {
       var actionName;
       if (editor !== null) {
@@ -33,7 +33,7 @@
         return;
       }
 
-      $actionSelect.find('option:selected').text();
+      actionName = $actionSelect.find('option:selected').text();
       $.getJSON('/api/v1/action/' + actionName + '/', function processAction(action) {
         var data;
         editor = new JSONEditor($editorElement[0], {

From f19ef67f523794deec7b79f4fbae39daaa0d46a6 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Wed, 6 Jul 2016 09:34:41 -0400
Subject: [PATCH 06/74] Add notifications for client-side validation errors &
 deleting recipes

Fixes bug 1283937
---
 .../control/static/control/js/actions/ControlActions.js    | 2 ++
 .../control/static/control/js/components/RecipeForm.js     | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/normandy/control/static/control/js/actions/ControlActions.js b/normandy/control/static/control/js/actions/ControlActions.js
index f093c52b..544b7e86 100644
--- a/normandy/control/static/control/js/actions/ControlActions.js
+++ b/normandy/control/static/control/js/actions/ControlActions.js
@@ -95,6 +95,8 @@ const apiRequestMap = {
       settings: {
         method: 'DELETE',
       },
+      successNotification: 'Recipe deleted.',
+      errorNotification: 'Error deleting recipe.',
     };
   },
 };
diff --git a/normandy/control/static/control/js/components/RecipeForm.js b/normandy/control/static/control/js/components/RecipeForm.js
index 0a60e5fc..c8cc79cc 100644
--- a/normandy/control/static/control/js/components/RecipeForm.js
+++ b/normandy/control/static/control/js/components/RecipeForm.js
@@ -4,7 +4,8 @@ import { push } from 'react-router-redux';
 import { destroy, reduxForm, getValues } from 'redux-form';
 import jexl from 'jexl';
 
-import { makeApiRequest, recipeUpdated, recipeAdded } from '../actions/ControlActions.js';
+import { makeApiRequest, recipeUpdated, recipeAdded, showNotification }
+  from '../actions/ControlActions.js';
 import composeRecipeContainer from './RecipeContainer.js';
 import ActionForm from './ActionForm.js';
 import CheckboxField from './form_fields/CheckboxField.js';
@@ -65,6 +66,10 @@ export class RecipeForm extends React.Component {
 
     return this.validateForm(combinedFormValues)
     .catch(() => {
+      dispatch(showNotification({
+        messageType: 'error',
+        message: 'Recipe cannot be saved. Please correct any errors listed in the form below.',
+      }));
       throw {
         filter_expression: 'Invalid Expression',
       };

From 25bf1191e8ac5338c19b20f872e4d1218c878ec4 Mon Sep 17 00:00:00 2001
From: Chris Hartjes <chartjes@littlehart.net>
Date: Mon, 11 Jul 2016 13:18:08 -0400
Subject: [PATCH 07/74] Initial commit of contract tests for the recipe server
 API

---
 CONTRACT-TESTS.md     | 20 ++++++++++++++++++++
 conftest.py           | 16 ++++++++++++++++
 manifest.ini          |  2 ++
 test-requirements.txt |  5 +++++
 4 files changed, 43 insertions(+)
 create mode 100644 CONTRACT-TESTS.md
 create mode 100644 conftest.py
 create mode 100644 manifest.ini
 create mode 100644 test-requirements.txt

diff --git a/CONTRACT-TESTS.md b/CONTRACT-TESTS.md
new file mode 100644
index 00000000..b1b39110
--- /dev/null
+++ b/CONTRACT-TESTS.md
@@ -0,0 +1,20 @@
+# API Contract Tests
+
+It's highly recommended to use [Virtualenv](https://virtualenv.pypa.io/en/latest/)
+in order to have an isolated environment.
+
+From the root directory of the project
+
+1. `virtualenv venv`
+2. `source venv/bin/activate` to turn on the virtualenv
+2. `./venv/bin/pip install -r test-requirements.txt`
+
+
+### Schema Check Tests
+
+These tests are designed to look for changes to the recipe server API that are
+not expected.
+
+`py.test --env=<environment> contract-tests/`
+
+where `<environment>` is one of `dev`, `stage`, or `prod`
diff --git a/conftest.py b/conftest.py
new file mode 100644
index 00000000..4be86535
--- /dev/null
+++ b/conftest.py
@@ -0,0 +1,16 @@
+# Configuration file for running our tests
+import pytest
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--env",
+        action="store",
+        required=True,
+        help="Choose a test environment: dev, stage, or prod",
+    )
+
+
+@pytest.fixture
+def env(request):
+    return request.config.getoption("--env")
diff --git a/manifest.ini b/manifest.ini
new file mode 100644
index 00000000..621fb13c
--- /dev/null
+++ b/manifest.ini
@@ -0,0 +1,2 @@
+[dev]
+api_root = https://normandy.dev.mozaws.net/api/v1
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..ebccf2e9
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,5 @@
+configparser
+flake8
+jsonschema
+pytest
+requests

From 617751ae34b5d1ef468a92dc92f1cce352348585 Mon Sep 17 00:00:00 2001
From: Chris Hartjes <chartjes@littlehart.net>
Date: Mon, 11 Jul 2016 13:20:10 -0400
Subject: [PATCH 08/74] Add in API tests

---
 contract-tests/test_api.py | 160 +++++++++++++++++++++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 contract-tests/test_api.py

diff --git a/contract-tests/test_api.py b/contract-tests/test_api.py
new file mode 100644
index 00000000..e2e9637c
--- /dev/null
+++ b/contract-tests/test_api.py
@@ -0,0 +1,160 @@
+import configparser
+import jsonschema
+import pytest
+import requests
+
+
+@pytest.fixture
+def conf():
+    config = configparser.ConfigParser()
+    config.read('manifest.ini')
+    return config
+
+
+def test_recipes(conf, env):
+    r = requests.get(conf.get(env, 'api_root') + '/recipe')
+    response = r.json()
+    expected_fields = [
+        'id',
+        'last_updated',
+        'name',
+        'enabled',
+        'revision_id',
+        'action',
+        'arguments',
+        'filter_expression',
+        'current_approval_request',
+        'approval',
+        'is_approved'
+    ]
+
+    expected_arguments = [
+        'defaults',
+        'surveyId',
+        'surveys'
+    ]
+
+    expected_survey_fields = [
+        'message',
+        'thanksMessage',
+        'engagementButtonLabel',
+        'title',
+        'postAnswerUrl',
+        'weight',
+        'learnMoreUrl',
+        'learnMoreMessage',
+    ]
+
+    expected_default_fields = [
+        'message',
+        'thanksMessage',
+        'engagementButtonLabel',
+        'postAnswerUrl',
+        'learnMoreUrl',
+        'learnMoreMessage'
+    ]
+
+    # Verify we have at least one response
+    assert len(response) >= 1
+
+    # Take a look at the first response and look for the expected fields
+    record = response[0]
+    for field in expected_fields:
+        assert field in record
+
+    # Do the arguments look right?
+    for argument in expected_arguments:
+        assert argument in record['arguments']
+
+    # Do the defaults look right?
+    for field in record['arguments']['defaults']:
+        assert field in expected_default_fields
+
+    # Do survey fields look right? Look at the first one
+    for field in record['arguments']['surveys'][0]:
+        assert field in expected_survey_fields
+
+
+def filter_show_heartbeat(record):
+    return record['name'] == 'show-heartbeat'
+
+
+def filter_console_log(record):
+    return record['name'] == 'console-log'
+
+
+def test_expected_action_types(conf, env):
+    r = requests.get(conf.get(env, 'api_root') + '/action')
+    response = r.json()
+
+    # Verify we have at least one response and then grab the first record
+    assert len(response) >= 1
+
+    # Make sure we only have expected action types
+    expected_records = ['console-log', 'show-heartbeat']
+
+    for record in response:
+        assert record['name'] in expected_records
+
+
+def test_console_log(conf, env):
+    r = requests.get(conf.get(env, 'api_root') + '/action')
+    response = r.json()
+
+    # Verify we have at least one response and then grab the first record
+    assert len(response) >= 1
+
+    # Look for any console-log actions
+    cl_records = list(filter(filter_console_log, response))
+
+    if len(cl_records) == 0:
+        pytest.skip('No console-log actions found')
+    else:
+        console_log_test(cl_records[0])
+
+
+def test_show_heartbeat(conf, env):
+    r = requests.get(conf.get(env, 'api_root') + '/action')
+    response = r.json()
+
+    # Verify we have at least one response and then grab the first record
+    assert len(response) >= 1
+
+    # Let's find at least one record that is a 'show-heartbeat'
+    sh_records = list(filter(filter_show_heartbeat, response))
+
+    if len(sh_records) == 0:
+        pytest.skip('No show-heartbeat actions found')
+    else:
+        show_hearbeat_test(sh_records[0])
+
+
+def show_hearbeat_test(record):
+    expected_action_fields = [
+        'name',
+        'implementation_url',
+        'arguments_schema'
+    ]
+    for field in record:
+        assert field in expected_action_fields
+
+    # Do we have a valid schema for 'arguments_schema'?
+    r = requests.get(record['arguments_schema']['$schema'])
+    schema = r.json()
+    assert jsonschema.validate(record['arguments_schema'], schema) is None
+
+
+def console_log_test(record):
+    # Does an 'action' have all the required fields?
+    expected_action_fields = [
+        'name',
+        'implementation_url',
+        'arguments_schema'
+    ]
+    for field in record:
+        assert field in expected_action_fields
+
+    # Do we have a valid schema for 'arguments_schema'?
+    r = requests.get(record['arguments_schema']['$schema'])
+    schema = r.json()
+    assert jsonschema.validate(record['arguments_schema'], schema) is None

From b1451daff1a78c034b4448f468809eb3f1937b17 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 12 Jul 2016 07:15:07 -0400
Subject: [PATCH 09/74] Fix prop values in ControlApp

---
 .../control/js/components/ControlApp.js       | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/normandy/control/static/control/js/components/ControlApp.js b/normandy/control/static/control/js/components/ControlApp.js
index ada389ed..c05367e4 100644
--- a/normandy/control/static/control/js/components/ControlApp.js
+++ b/normandy/control/static/control/js/components/ControlApp.js
@@ -1,22 +1,28 @@
-import React from 'react';
+import React, { PropTypes as pt } from 'react';
 import Header from './Header.js';
 import Notifications from './Notifications.js';
 
-export default function ControlApp() {
+export default function ControlApp({ children, location, routes, params }) {
   return (
     <div>
       <Notifications />
       <Header
-        pageType={this.props.children.props.route}
-        currentLocation={this.props.location.pathname}
-        routes={this.props.routes}
-        params={this.props.params}
+        pageType={children.props.route}
+        currentLocation={location.pathname}
+        routes={routes}
+        params={params}
       />
       <div id="content" className="wrapper">
         {
-          React.Children.map(this.props.children, child => React.cloneElement(child))
+          React.Children.map(children, child => React.cloneElement(child))
         }
       </div>
     </div>
   );
 }
+ControlApp.propTypes = {
+  children: pt.object.isRequired,
+  location: pt.object.isRequired,
+  routes: pt.object.isRequired,
+  params: pt.object.isRequired,
+};

From 3ed2adc01cce2bf8d384d898dfa65cf819a88a7c Mon Sep 17 00:00:00 2001
From: Chris Hartjes <chartjes@littlehart.net>
Date: Tue, 12 Jul 2016 14:57:21 -0400
Subject: [PATCH 10/74] Cleaned up issues with dependencies needed for API
 tests, created documentation in the docs/ directory, altered circle.yml file
 to specify which tests to run with pytest

---
 CONTRACT-TESTS.md          | 20 ------------
 circle.yml                 |  2 +-
 contract-tests/test_api.py | 64 --------------------------------------
 docs/dev/api-tests.rst     | 13 ++++++++
 requirements.txt           |  2 ++
 test-requirements.txt      |  5 ---
 6 files changed, 16 insertions(+), 90 deletions(-)
 delete mode 100644 CONTRACT-TESTS.md
 create mode 100644 docs/dev/api-tests.rst
 delete mode 100644 test-requirements.txt

diff --git a/CONTRACT-TESTS.md b/CONTRACT-TESTS.md
deleted file mode 100644
index b1b39110..00000000
--- a/CONTRACT-TESTS.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# API Contract Tests
-
-It's highly recommended to use [Virtualenv](https://virtualenv.pypa.io/en/latest/)
-in order to have an isolated environment.
-
-From the root directory of the project
-
-1. `virtualenv venv`
-2. `source venv/bin/activate` to turn on the virtualenv
-2. `./venv/bin/pip install -r test-requirements.txt`
-
-
-### Schema Check Tests
-
-These tests are designed to look for changes to the recipe server API that are
-not expected.
-
-`py.test --env=<environment> contract-tests/`
-
-where `<environment>` is one of `dev`, `stage`, or `prod`
diff --git a/circle.yml b/circle.yml
index 9d15cd7e..56225729 100644
--- a/circle.yml
+++ b/circle.yml
@@ -35,7 +35,7 @@ test:
       docker run --net host -e DJANGO_CONFIGURATION=Test
       -v $CIRCLE_TEST_REPORTS:/test_artifacts
       -v ~/cache/GeoLite2-Country.mmdb:/app/GeoLite2-Country.mmdb
-      normandy:build py.test --junitxml=/test_artifacts/pytest.xml
+      normandy:build py.test --junitxml=/test_artifacts/pytest.xml normandy/
     # Start Karma test server, and run them in Firefox
     - >
       (
diff --git a/contract-tests/test_api.py b/contract-tests/test_api.py
index e2e9637c..65a28943 100644
--- a/contract-tests/test_api.py
+++ b/contract-tests/test_api.py
@@ -11,70 +11,6 @@ def conf():
     return config
 
 
-def test_recipes(conf, env):
-    r = requests.get(conf.get(env, 'api_root') + '/recipe')
-    response = r.json()
-    expected_fields = [
-        'id',
-        'last_updated',
-        'name',
-        'enabled',
-        'revision_id',
-        'action',
-        'arguments',
-        'filter_expression',
-        'current_approval_request',
-        'approval',
-        'is_approved'
-    ]
-
-    expected_arguments = [
-        'defaults',
-        'surveyId',
-        'surveys'
-    ]
-
-    expected_survey_fields = [
-        'message',
-        'thanksMessage',
-        'engagementButtonLabel',
-        'title',
-        'postAnswerUrl',
-        'weight',
-        'learnMoreUrl',
-        'learnMoreMessage',
-    ]
-
-    expected_default_fields = [
-        'message',
-        'thanksMessage',
-        'engagementButtonLabel',
-        'postAnswerUrl',
-        'learnMoreUrl',
-        'learnMoreMessage'
-    ]
-
-    # Verify we have at least one response
-    assert len(response) >= 1
-
-    # Take a look at the first response and look for the expected fields
-    record = response[0]
-    for field in expected_fields:
-        assert field in record
-
-    # Do the arguments look right?
-    for argument in expected_arguments:
-        assert argument in record['arguments']
-
-    # Do the defaults look right?
-    for field in record['arguments']['defaults']:
-        assert field in expected_default_fields
-
-    # Do survey fields look right? Look at the first one
-    for field in record['arguments']['surveys'][0]:
-        assert field in expected_survey_fields
-
-
 def filter_show_heartbeat(record):
     return record['name'] == 'show-heartbeat'
 
diff --git a/docs/dev/api-tests.rst b/docs/dev/api-tests.rst
new file mode 100644
index 00000000..87ef1b37
--- /dev/null
+++ b/docs/dev/api-tests.rst
@@ -0,0 +1,13 @@
+API Contract Tests
+==================
+
+These tests are designed to look for changes to the recipe server API that are
+not expected.
+
+To run these tests, use the following command from the root project directory.
+
+.. code-block:: bash
+
+    py.test --env=<environment> contract-tests/
+
+where ``<environment>`` is one of `dev`, `stage`, or `prod`
diff --git a/requirements.txt b/requirements.txt
index ecd81308..50a9847b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -170,3 +170,5 @@ pyflakes==1.0.0 \
     --hash=sha256:f39e33a4c03beead8774f005bd3ecf0c3f2f264fa0201de965fce0aff1d34263
 flake8-junit-report==2.0.1 \
     --hash=sha256:55914a99126d3b30cad2a042d95d466b5b368c7f69ef68ec7ec8321d3f0e2eee
+configparser==3.5.0 \
+    --hash=sha256:5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index ebccf2e9..00000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-configparser
-flake8
-jsonschema
-pytest
-requests

From b46a7d60a2d45ffdad577570aa61695eed94e4db Mon Sep 17 00:00:00 2001
From: Chris Hartjes <chartjes@littlehart.net>
Date: Tue, 12 Jul 2016 15:08:34 -0400
Subject: [PATCH 11/74] The --end flag should not be required for pytest runs

---
 conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conftest.py b/conftest.py
index 4be86535..a5533ce5 100644
--- a/conftest.py
+++ b/conftest.py
@@ -6,7 +6,7 @@ def pytest_addoption(parser):
     parser.addoption(
         "--env",
         action="store",
-        required=True,
+        required=False,
         help="Choose a test environment: dev, stage, or prod",
     )
 

From 51844a10a9a09fa24aeb8744d49cce13594d6990 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Tue, 12 Jul 2016 14:32:59 -0700
Subject: [PATCH 12/74] Document the basics of how to write filter expressions.

fix bug 1284598
---
 docs/dev/install.rst             |   6 +-
 docs/index.rst                   |  25 +++-
 docs/user/filter_expressions.rst | 205 +++++++++++++++++++++++++++++++
 3 files changed, 231 insertions(+), 5 deletions(-)
 create mode 100644 docs/user/filter_expressions.rst

diff --git a/docs/dev/install.rst b/docs/dev/install.rst
index f548234e..5aab8777 100644
--- a/docs/dev/install.rst
+++ b/docs/dev/install.rst
@@ -109,11 +109,11 @@ Installation
       ./bin/download_geolite2.sh
 
 10. Add some useful initial data to your database using the ``initial_data``
-   command:
+    command:
 
-   .. code-block:: bash
+    .. code-block:: bash
 
-      python manage.py initial_data
+       python manage.py initial_data
 
 Once you've finished these steps, you should be able to start the site by
 running:
diff --git a/docs/index.rst b/docs/index.rst
index fbcd68d1..0a078af4 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -5,15 +5,36 @@ JavaScript to various clients based on certain rules.
 
 .. _SHIELD: https://wiki.mozilla.org/Firefox/SHIELD
 
+User Documentation
+------------------
+.. toctree::
+   :maxdepth: 2
+
+   user/filter_expressions
+
+Developer Documentation
+-----------------------
 .. toctree::
    :maxdepth: 2
 
    dev/install
    dev/workflow
    dev/concepts
-   qa/example
    dev/self-repair
    dev/driver
    dev/troubleshooting
-   qa/docker
+
+QA Documentation
+----------------
+.. toctree::
+   :maxdepth: 2
+
+   qa/example
+   qa/setup
+
+Operations Documentation
+------------------------
+.. toctree::
+   :maxdepth: 2
+
    ops/config
diff --git a/docs/user/filter_expressions.rst b/docs/user/filter_expressions.rst
new file mode 100644
index 00000000..d4a53148
--- /dev/null
+++ b/docs/user/filter_expressions.rst
@@ -0,0 +1,205 @@
+Filter Expressions
+==================
+Filter expressions describe which users a :ref:`recipe <recipes>` should be
+executed for. They're executed locally in the client's browser and, if they
+pass, the corresponding recipe is executed. Filter expressions have access to
+information about the user, such as their location, locale, and Firefox version.
+
+Filter expressions are written using a language called JEXL_. JEXL is an
+open-source expression language that is given a context (in this case,
+information about the user's browser) and evaluates a statement using that
+context. JEXL stands for "JavaScript Expression Language" and uses JavaScript
+syntax for several (but not all) of its features.
+
+.. note:: The rest of this document includes examples of JEXL syntax that has
+   comments inline with the expressions. JEXL does **not** have any support for
+   comments in statements, but we're using them to make understanding our
+   examples easier.
+
+.. _JEXL: https://github.com/TechnologyAdvice/Jexl
+
+JEXL Basics
+-----------
+The `JEXL Readme`_ describes the syntax of the language in detail; the following
+section covers the basics of writing valid JEXL expressions.
+
+.. note:: Normally, JEXL doesn't allow newlines or other whitespace besides
+   spaces in expressions, but filter expressions in Normandy allow arbitrary
+   whitespace.
+
+A JEXL expression evaluates down to a single value. JEXL supports several basic
+types, such as numbers, strings (single or double quoted), and booleans. JEXL
+also supports several operators for combining values, such as arithmetic,
+boolean operators, comparisons, and string concatenation.
+
+.. code-block:: javascript
+
+   // Arithmetic
+   2 + 2 - 3 // == 1
+
+   // Numerical comparisons
+   5 > 7 // == false
+
+   // Boolean operators
+   false || 5 > 4 // == true
+
+   // String concatenation
+   "Mozilla" + " " + "Firefox" // == "Mozilla Firefox"
+
+Expressions can be grouped using parenthesis:
+
+.. code-block:: javascript
+
+   ((2 + 3) * 3) - 3 // == 7
+
+JEXL also supports lists and objects (known as dictionaries in other languages)
+as well as attribute access:
+
+.. code-block:: javascript
+
+   [1, 2, 1].length // == 3
+   {foo: 1, bar: 2}.foo // == 1
+
+Unlike JavaScript, JEXL supports an ``in`` operator for checking if a substring
+is in a string or if an element is in an array:
+
+.. code-block:: javascript
+
+   "bar" in "foobarbaz" // == true
+   3 in [1, 2, 3, 4] // == true
+
+The context passed to JEXL can be expressed using identifiers, which also
+support attribute access:
+
+.. code-block:: javascript
+
+   normandy.locale == 'en-US' // == true if the client's locale is en-US
+
+Another unique feature of JEXL is transforms, which modify the value given to
+them. Transforms are applied to a value using the ``|`` operator, and may take
+additional arguments passed in the expression:
+
+.. code-block:: javascript
+
+   'January 7th, 1980'|date // == a date object
+
+.. _JEXL Readme: https://github.com/TechnologyAdvice/Jexl#jexl---
+
+Context
+-------
+This section defines the context passed to filter expressions when they are
+evaluated. In other words, this is the client information available within
+filter expressions.
+
+.. js:data:: normandy
+
+   The ``normandy`` object contains general information about the client.
+
+.. js:attribute:: normandy.version
+
+   **Example:** ``'47.0.1'``
+
+   String containing the user's Firefox version.
+
+.. js:attribute:: normandy.channel
+
+   String containing the update channel. Valid values include, but are not
+   limited to:
+
+   * ``'release'``
+   * ``'aurora'``
+   * ``'beta'``
+   * ``'nightly'``
+   * ``'default'`` (self-built or automated testing builds)
+
+.. js:attribute:: normandy.isDefaultBrowser
+
+   Boolean specifying whether Firefox is set as the user's default browser.
+
+.. js:attribute:: normandy.searchEngine
+
+   **Example:** ``'google'``
+
+   String containing the user's default search engine identifier.
+
+.. js:attribute:: normandy.syncSetup
+
+   Boolean containing whether the user has set up Firefox Sync.
+
+.. js:attribute:: normandy.plugins
+
+   An object mapping of plugin names to :js:class:`Plugin` objects describing
+   the plugins installed on the client.
+
+.. js:attribute:: normandy.locale
+
+   **Example:** ``'en-US'``
+
+   String containing the user's locale.
+
+.. js:attribute:: normandy.country
+
+   **Example:** ``'US'``
+
+   `ISO 3166-1 alpha-2`_ country code for the country that the user is located
+   in. This is determined via IP-based geolocation.
+
+   .. _ISO 3166-1 alpha-2: https://en.wikipedia.org/wiki/ISO_3166-1
+
+.. js:attribute:: normandy.request_time
+
+   Date object set to the time and date that the user requested recipes from
+   Normandy. Useful for comparing against date ranges that a recipe is valid
+   for.
+
+   .. code-block:: javascript
+
+      // Do not run recipe after January 1st.
+      normandy.request_time < '2011-01-01'|date
+
+Transforms
+----------
+This section describes the transforms available to filter expressions, and what
+they do. They're documented as functions, and the first parameter to each
+function is the value being transformed.
+
+.. js:function:: date(dateString)
+
+   Parses a string as a date and returns a Date object. Strings should be in a
+   format recognized by `Date.parse()`_.
+
+   :param string dateString:
+      String to parse as a date.
+
+   .. code-block:: javascript
+
+      '2011-10-10T14:48:00'|date // == Date object matching the given date
+
+   .. _Date.parse(): https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse
+
+Examples
+--------
+This section lists some examples of commonly-used filter expressions.
+
+.. code-block:: javascript
+
+   // Match users using the en-US locale while located in India
+   normandy.locale == 'en-US' && normandy.country == 'IN'
+
+   // Match users in any English locale using Firefox Beta
+   (
+      normandy.locale in ['en-US', 'en-AU', 'en-CA', 'en-GB', 'en-NZ', 'en-ZA']
+      && normandy.channel == 'beta'
+   )
+
+   // Only run the recipe between January 1st, 2011 and January 7th, 2011
+   (
+      normandy.request_time > '2011-01-01T00:00:00+00:00'|date
+      && normandy.request_time < '2011-01-07T00:00:00+00:00'|date
+   )
+
+   // Match users located in the US who have Firefox as their default browser
+   normandy.country == 'US' && normandy.isDefaultBrowser
+
+   // Match users with the Flash plugin installed
+   normandy.plugins['Shockwave Flash']

From 10e8bcb95194d16c2c302100294346725f480ce5 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Tue, 12 Jul 2016 13:56:02 -0700
Subject: [PATCH 13/74] Standardize usage of jexl across the app

Fixes bug 1280196
Fixes bug 1284597
---
 karma.conf.js                                 | 30 ++++++------
 .../control/js/components/RecipeForm.js       |  5 +-
 normandy/selfrepair/static/js/JexlEnv.js      | 16 ++++++
 .../static/js/self_repair_runner.js           | 10 ++--
 normandy/selfrepair/tests/test_JexlEnv.js     | 49 +++++++++++++++++++
 5 files changed, 86 insertions(+), 24 deletions(-)
 create mode 100644 normandy/selfrepair/static/js/JexlEnv.js
 create mode 100644 normandy/selfrepair/tests/test_JexlEnv.js

diff --git a/karma.conf.js b/karma.conf.js
index 011646e9..7f9bf8bb 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -44,37 +44,37 @@ module.exports = function (config) {
     },
 
     webpackServer: {
-      quiet: true, // Suppress all webpack messages, except errors
+      quiet: true, // Suppress *all* webpack messages, including errors
     },
 
-        // test results reporter to use
-        // possible values: 'dots', 'progress'
-        // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
     reporters: ['spec'],
 
-        // web server port
+    // web server port
     port: 9876,
 
-        // enable / disable colors in the output (reporters and logs)
+    // enable / disable colors in the output (reporters and logs)
     colors: true,
 
-        // level of logging
-        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
     logLevel: config.LOG_INFO,
 
-        // enable / disable watching file and executing tests whenever any file changes
+    // enable / disable watching file and executing tests whenever any file changes
     autoWatch: true,
 
-        // start these browsers
-        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     browsers: ['Firefox'],
 
-        // Continuous Integration mode
-        // if true, Karma captures browsers, runs the tests and exits
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
     singleRun: false,
 
-        // Concurrency level
-        // how many browser should be started simultaneous
+    // Concurrency level
+    // how many browser should be started simultaneous
     concurrency: Infinity,
   };
 
diff --git a/normandy/control/static/control/js/components/RecipeForm.js b/normandy/control/static/control/js/components/RecipeForm.js
index c8cc79cc..9658b641 100644
--- a/normandy/control/static/control/js/components/RecipeForm.js
+++ b/normandy/control/static/control/js/components/RecipeForm.js
@@ -2,7 +2,6 @@ import React, { PropTypes as pt } from 'react';
 import { Link } from 'react-router';
 import { push } from 'react-router-redux';
 import { destroy, reduxForm, getValues } from 'redux-form';
-import jexl from 'jexl';
 
 import { makeApiRequest, recipeUpdated, recipeAdded, showNotification }
   from '../actions/ControlActions.js';
@@ -10,6 +9,7 @@ import composeRecipeContainer from './RecipeContainer.js';
 import ActionForm from './ActionForm.js';
 import CheckboxField from './form_fields/CheckboxField.js';
 import FormField from './form_fields/FormFieldWrapper.js';
+import JexlEnv from '../../../../../selfrepair/static/js/JexlEnv.js';
 
 export class RecipeForm extends React.Component {
   propTypes = {
@@ -53,7 +53,8 @@ export class RecipeForm extends React.Component {
 
   validateForm(formValues) {
     const jexlExpression = formValues.filter_expression;
-    return jexl.eval(jexlExpression, {});
+    const jexlEnv = new JexlEnv({});
+    return jexlEnv.eval(jexlExpression, {});
   }
 
   submitForm() {
diff --git a/normandy/selfrepair/static/js/JexlEnv.js b/normandy/selfrepair/static/js/JexlEnv.js
new file mode 100644
index 00000000..a42f1d79
--- /dev/null
+++ b/normandy/selfrepair/static/js/JexlEnv.js
@@ -0,0 +1,16 @@
+import { Jexl } from 'jexl';
+import { stableSample } from './utils.js';
+
+export default class JexlEnv {
+  constructor(context) {
+    this.context = context;
+    this.jexl = new Jexl();
+    this.jexl.addTransform('date', value => new Date(value));
+    this.jexl.addTransform('stableSample', stableSample);
+  }
+
+  eval(expr) {
+    const oneLineExpr = expr.replace('\n', ' ');
+    return this.jexl.eval(oneLineExpr, this.context);
+  }
+}
diff --git a/normandy/selfrepair/static/js/self_repair_runner.js b/normandy/selfrepair/static/js/self_repair_runner.js
index 7c6c5099..04a52e08 100644
--- a/normandy/selfrepair/static/js/self_repair_runner.js
+++ b/normandy/selfrepair/static/js/self_repair_runner.js
@@ -1,9 +1,6 @@
 import uuid from 'node-uuid';
-import jexl from 'jexl';
-
-
-jexl.addTransform('date', value => new Date(value));
 
+import JexlEnv from './JexlEnv.js';
 
 const registeredActions = {};
 window.registerAction = (name, ActionClass) => {
@@ -134,8 +131,7 @@ export function filterContext(driver) {
  */
 export function doesRecipeMatch(recipe, context) {
     // Remove newlines, which are invalid in JEXL
+  const jexlEnv = new JexlEnv(context);
   const filterExpression = recipe.filterExpression.replace(/\r?\n|\r/g, '');
-
-  return jexl.eval(filterExpression, context)
-    .then(value => [recipe, !!value]);
+  return jexlEnv.eval(filterExpression).then(value => [recipe, !!value]);
 }
diff --git a/normandy/selfrepair/tests/test_JexlEnv.js b/normandy/selfrepair/tests/test_JexlEnv.js
new file mode 100644
index 00000000..f8f7e8ef
--- /dev/null
+++ b/normandy/selfrepair/tests/test_JexlEnv.js
@@ -0,0 +1,49 @@
+import JexlEnv from '../static/js/JexlEnv.js';
+
+describe('JexlEnv', () => {
+  let jexlEnv;
+
+  beforeAll(() => {
+    jexlEnv = new JexlEnv();
+  });
+
+  it('should pull values from the context', () => {
+    const marker = Symbol();
+    const context = { data: { marker } };
+    jexlEnv = new JexlEnv(context);
+    return jexlEnv.eval('data.marker')
+    .then(val => expect(val).toEqual(marker));
+  });
+
+  it('should execute simple expressions', () => (
+    jexlEnv.eval('2+2')
+    .then(val => expect(val).toEqual(4))
+  ));
+
+  it('should execute multiline statements', () => (
+    jexlEnv.eval('1 + 5 *\n8 + 1')
+    .then(val => expect(val).toEqual(42))
+  ));
+
+  it('should have a date filter', () => (
+    jexlEnv.eval('"2016-07-12T00:00:00"|date')
+    .then(val => expect(val).toEqual(new Date(2016, 6, 12)))
+  ));
+
+  describe('stable sample filter', () => {
+    it('should have a stableSample filter', () => (
+      // Expect to not fail
+      jexlEnv.eval('"test"|stableSample(0.5)')
+    ));
+
+    it('should return true for matching samples', () => (
+      jexlEnv.eval('"test"|stableSample(1.0)')
+      .then(val => expect(val).toEqual(true))
+    ));
+
+    it('should return false for matching samples', () => (
+      jexlEnv.eval('"test"|stableSample(0.0)')
+      .then(val => expect(val).toEqual(false))
+    ));
+  });
+});

From 71394a21e3e34c3986e930eda825b97d2b23b6e9 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Wed, 13 Jul 2016 10:00:01 -0700
Subject: [PATCH 14/74] Review feedback.

---
 docs/user/filter_expressions.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/user/filter_expressions.rst b/docs/user/filter_expressions.rst
index d4a53148..b01f8201 100644
--- a/docs/user/filter_expressions.rst
+++ b/docs/user/filter_expressions.rst
@@ -81,7 +81,7 @@ additional arguments passed in the expression:
 
 .. code-block:: javascript
 
-   'January 7th, 1980'|date // == a date object
+   '1980-01-07'|date // == a date object
 
 .. _JEXL Readme: https://github.com/TechnologyAdvice/Jexl#jexl---
 
@@ -165,8 +165,8 @@ function is the value being transformed.
 
 .. js:function:: date(dateString)
 
-   Parses a string as a date and returns a Date object. Strings should be in a
-   format recognized by `Date.parse()`_.
+   Parses a string as a date and returns a Date object. Date strings should be
+   in `ISO 8601`_ format.
 
    :param string dateString:
       String to parse as a date.
@@ -175,7 +175,7 @@ function is the value being transformed.
 
       '2011-10-10T14:48:00'|date // == Date object matching the given date
 
-   .. _Date.parse(): https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse
+   .. _ISO 8601: https://www.w3.org/TR/NOTE-datetime
 
 Examples
 --------
@@ -201,5 +201,7 @@ This section lists some examples of commonly-used filter expressions.
    // Match users located in the US who have Firefox as their default browser
    normandy.country == 'US' && normandy.isDefaultBrowser
 
-   // Match users with the Flash plugin installed
+   // Match users with the Flash plugin installed. If Flash is missing, the
+   // plugin list returns `undefined`, which is a falsy value in JavaScript and
+   // fails the match. Otherwise, it returns a plugin object, which is truthy.
    normandy.plugins['Shockwave Flash']

From e325ebbe02a01da97b7c3037fcd46437bf63b7b3 Mon Sep 17 00:00:00 2001
From: Chris Hartjes <chartjes@littlehart.net>
Date: Thu, 14 Jul 2016 09:43:39 -0400
Subject: [PATCH 15/74] Added a default value for --env so as to not break CI
 builds

---
 conftest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conftest.py b/conftest.py
index a5533ce5..ea91cc78 100644
--- a/conftest.py
+++ b/conftest.py
@@ -7,6 +7,7 @@ def pytest_addoption(parser):
         "--env",
         action="store",
         required=False,
+        default="dev",
         help="Choose a test environment: dev, stage, or prod",
     )
 

From f92a4dbaad17aac0e7436f11f659b847aba54fe6 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Thu, 14 Jul 2016 10:13:26 -0700
Subject: [PATCH 16/74] Add stableSample to JEXL docs.

---
 docs/user/filter_expressions.rst | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/docs/user/filter_expressions.rst b/docs/user/filter_expressions.rst
index b01f8201..d2e9063a 100644
--- a/docs/user/filter_expressions.rst
+++ b/docs/user/filter_expressions.rst
@@ -163,6 +163,32 @@ This section describes the transforms available to filter expressions, and what
 they do. They're documented as functions, and the first parameter to each
 function is the value being transformed.
 
+.. js:function:: stableSample(input, rate)
+
+   Randomly returns ``true`` or ``false`` based on the given sample rate. Used
+   to sample over the set of matched users.
+
+   Sampling with this transform is stable over the input, meaning that the same
+   input and sample rate will always result in the same return value. The most
+   common use is to pass in a unique user ID and a recipe ID as the input; this
+   means that each user will consistently run or not run a recipe.
+
+   Without stable sampling, a user might execute a recipe on Monday, and then
+   not execute it on Tuesday. In addition, without stable sampling, a recipe
+   would be seen by a different percentage of users each day, and over time this
+   would add up such that the recipe is seen by more than the percent sampled.
+
+   :param input:
+      A value for the sample to be stable over.
+   :param number rate:
+      A number between ``0`` and ``1`` with the sample rate. For example,
+      ``0.5`` would be a 50% sample rate.
+
+   .. code-block:: javascript
+
+      // True 50% of the time, stable per-user per-recipe.
+      [normandy.userId, normandy.recipe.id]|stableSample(0.5)
+
 .. js:function:: date(dateString)
 
    Parses a string as a date and returns a Date object. Date strings should be
@@ -186,6 +212,12 @@ This section lists some examples of commonly-used filter expressions.
    // Match users using the en-US locale while located in India
    normandy.locale == 'en-US' && normandy.country == 'IN'
 
+   // Match 10% of users in the fr locale.
+   (
+      normandy.locale == 'fr'
+      && [normandy.userId, normandy.recipe.id]|stableSample(0.1)
+   )
+
    // Match users in any English locale using Firefox Beta
    (
       normandy.locale in ['en-US', 'en-AU', 'en-CA', 'en-GB', 'en-NZ', 'en-ZA']

From 3f538c2dbbdf4e1c023d174c4ff21b32dc0c78a0 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Thu, 14 Jul 2016 11:05:58 -0700
Subject: [PATCH 17/74] Add docker-image-shasum256.txt to CI artifacts

Fixes bug 1273332
---
 circle.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/circle.yml b/circle.yml
index 9d15cd7e..7902be0c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,6 +13,8 @@ dependencies:
     - if [ -e ~/cache/docker/image.tar ]; then echo "Loading image.tar"; docker load -i ~/cache/docker/image.tar || rm ~/cache/docker/image.tar; fi
     # build image
     - docker build -t normandy:build .
+    # write the sha256 sum to an artifact to make image verification easier
+    - docker inspect -f '{{.Config.Image}}' normandy:build | tee $CIRCLE_ARTIFACTS/docker-image-shasum256.txt
     # Get MaxMind GeoIP database
     - cd ~/cache/ && ~/normandy/bin/download_geolite2.sh
 

From 4666f70e6cc4ce187e1243fa834265b21aa18216 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Thu, 14 Jul 2016 16:54:15 -0700
Subject: [PATCH 18/74] Feedback

---
 .../control/static/control/js/components/RecipeForm.js    | 4 ++--
 .../static/js/{JexlEnv.js => JexlEnvironment.js}          | 4 ++--
 normandy/selfrepair/static/js/self_repair_runner.js       | 7 +++----
 normandy/selfrepair/tests/test_JexlEnv.js                 | 8 ++++----
 4 files changed, 11 insertions(+), 12 deletions(-)
 rename normandy/selfrepair/static/js/{JexlEnv.js => JexlEnvironment.js} (78%)

diff --git a/normandy/control/static/control/js/components/RecipeForm.js b/normandy/control/static/control/js/components/RecipeForm.js
index 9658b641..a90c1bab 100644
--- a/normandy/control/static/control/js/components/RecipeForm.js
+++ b/normandy/control/static/control/js/components/RecipeForm.js
@@ -9,7 +9,7 @@ import composeRecipeContainer from './RecipeContainer.js';
 import ActionForm from './ActionForm.js';
 import CheckboxField from './form_fields/CheckboxField.js';
 import FormField from './form_fields/FormFieldWrapper.js';
-import JexlEnv from '../../../../../selfrepair/static/js/JexlEnv.js';
+import JexlEnvironment from '../../../../../selfrepair/static/js/JexlEnvironment.js';
 
 export class RecipeForm extends React.Component {
   propTypes = {
@@ -53,7 +53,7 @@ export class RecipeForm extends React.Component {
 
   validateForm(formValues) {
     const jexlExpression = formValues.filter_expression;
-    const jexlEnv = new JexlEnv({});
+    const jexlEnv = new JexlEnvironment({});
     return jexlEnv.eval(jexlExpression, {});
   }
 
diff --git a/normandy/selfrepair/static/js/JexlEnv.js b/normandy/selfrepair/static/js/JexlEnvironment.js
similarity index 78%
rename from normandy/selfrepair/static/js/JexlEnv.js
rename to normandy/selfrepair/static/js/JexlEnvironment.js
index a42f1d79..450ecfe2 100644
--- a/normandy/selfrepair/static/js/JexlEnv.js
+++ b/normandy/selfrepair/static/js/JexlEnvironment.js
@@ -1,7 +1,7 @@
 import { Jexl } from 'jexl';
 import { stableSample } from './utils.js';
 
-export default class JexlEnv {
+export default class JexlEnvironment {
   constructor(context) {
     this.context = context;
     this.jexl = new Jexl();
@@ -10,7 +10,7 @@ export default class JexlEnv {
   }
 
   eval(expr) {
-    const oneLineExpr = expr.replace('\n', ' ');
+    const oneLineExpr = expr.replace(/\r?\n|\r/g, ' ');
     return this.jexl.eval(oneLineExpr, this.context);
   }
 }
diff --git a/normandy/selfrepair/static/js/self_repair_runner.js b/normandy/selfrepair/static/js/self_repair_runner.js
index 04a52e08..cccd9ddd 100644
--- a/normandy/selfrepair/static/js/self_repair_runner.js
+++ b/normandy/selfrepair/static/js/self_repair_runner.js
@@ -1,6 +1,6 @@
 import uuid from 'node-uuid';
 
-import JexlEnv from './JexlEnv.js';
+import JexlEnvironment from './JexlEnvironment.js';
 
 const registeredActions = {};
 window.registerAction = (name, ActionClass) => {
@@ -131,7 +131,6 @@ export function filterContext(driver) {
  */
 export function doesRecipeMatch(recipe, context) {
     // Remove newlines, which are invalid in JEXL
-  const jexlEnv = new JexlEnv(context);
-  const filterExpression = recipe.filterExpression.replace(/\r?\n|\r/g, '');
-  return jexlEnv.eval(filterExpression).then(value => [recipe, !!value]);
+  const jexlEnv = new JexlEnvironment(context);
+  return jexlEnv.eval(recipe.filterExpression).then(value => [recipe, !!value]);
 }
diff --git a/normandy/selfrepair/tests/test_JexlEnv.js b/normandy/selfrepair/tests/test_JexlEnv.js
index f8f7e8ef..f9610e50 100644
--- a/normandy/selfrepair/tests/test_JexlEnv.js
+++ b/normandy/selfrepair/tests/test_JexlEnv.js
@@ -1,16 +1,16 @@
-import JexlEnv from '../static/js/JexlEnv.js';
+import JexlEnvironment from '../static/js/JexlEnvironment.js';
 
-describe('JexlEnv', () => {
+describe('JexlEnvironment', () => {
   let jexlEnv;
 
   beforeAll(() => {
-    jexlEnv = new JexlEnv();
+    jexlEnv = new JexlEnvironment();
   });
 
   it('should pull values from the context', () => {
     const marker = Symbol();
     const context = { data: { marker } };
-    jexlEnv = new JexlEnv(context);
+    jexlEnv = new JexlEnvironment(context);
     return jexlEnv.eval('data.marker')
     .then(val => expect(val).toEqual(marker));
   });

From d5fd673bfc63503607fee2700c91d51d0f21e9d4 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Wed, 13 Jul 2016 07:53:29 -0400
Subject: [PATCH 19/74] Validate argument errors server-side

---
 .../control/js/components/RecipeForm.js       |  2 +
 normandy/recipes/api/serializers.py           | 38 +++++++++++++++++++
 normandy/recipes/validators.py                | 25 ++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/normandy/control/static/control/js/components/RecipeForm.js b/normandy/control/static/control/js/components/RecipeForm.js
index a90c1bab..0c762e39 100644
--- a/normandy/control/static/control/js/components/RecipeForm.js
+++ b/normandy/control/static/control/js/components/RecipeForm.js
@@ -2,6 +2,7 @@ import React, { PropTypes as pt } from 'react';
 import { Link } from 'react-router';
 import { push } from 'react-router-redux';
 import { destroy, reduxForm, getValues } from 'redux-form';
+import { _ } from 'underscore';
 
 import { makeApiRequest, recipeUpdated, recipeAdded, showNotification }
   from '../actions/ControlActions.js';
@@ -63,6 +64,7 @@ export class RecipeForm extends React.Component {
     const recipeFormValues = getValues(formState.recipe);
     const actionFormValues = getValues(formState.action);
     const combinedFormValues = { ...recipeFormValues, arguments: actionFormValues };
+
     const requestBody = { recipe: combinedFormValues, recipeId };
 
     return this.validateForm(combinedFormValues)
diff --git a/normandy/recipes/api/serializers.py b/normandy/recipes/api/serializers.py
index ea4e31a4..b2654016 100644
--- a/normandy/recipes/api/serializers.py
+++ b/normandy/recipes/api/serializers.py
@@ -7,6 +7,7 @@ from normandy.base.api.serializers import UserSerializer
 from normandy.recipes.api.fields import ActionImplementationHyperlinkField
 from normandy.recipes.models import (Action, Recipe, Approval, ApprovalRequest,
                                      ApprovalRequestComment)
+from normandy.recipes.validators import Validator
 
 
 class ActionSerializer(serializers.ModelSerializer):
@@ -102,6 +103,43 @@ class RecipeSerializer(serializers.ModelSerializer):
             'is_approved',
         ]
 
+    def validate_arguments(self, value):
+        # Get the schema associated with the selected action
+        try:
+            schema = Action.objects.get(name=self.initial_data.get('action')).arguments_schema
+        except:
+            raise serializers.ValidationError('Could not find arguments schema.')
+
+        schemaValidator = Validator(schema)
+        errorResponse = {}
+        errors = sorted(schemaValidator.iter_errors(value), key=lambda e: e.path)
+
+        for error in errors:
+            currentLevel = errorResponse
+
+            # Loop through the path of the current error
+            # e.g. ['surveys'][0]['weight']
+            for index, path in enumerate(error.path):
+                # If this key already exists in our error response, step into it
+                if path in currentLevel:
+                    currentLevel = currentLevel[path]
+                    continue
+                else:
+                    # If we haven't reached the end of the path, add this path
+                    # as a key in our error response object and step into it
+                    if index < len(error.path) - 1:
+                        currentLevel[path] = {}
+                        currentLevel = currentLevel[path]
+                        continue
+                    # If we've reached the final path, set the error message
+                    else:
+                        currentLevel[path] = error.message
+
+        if (errorResponse):
+            raise serializers.ValidationError(errorResponse)
+
+        return value
+
 
 class ClientSerializer(serializers.Serializer):
     country = serializers.CharField()
diff --git a/normandy/recipes/validators.py b/normandy/recipes/validators.py
index 7dc3ef41..52a7f07b 100644
--- a/normandy/recipes/validators.py
+++ b/normandy/recipes/validators.py
@@ -1,8 +1,33 @@
 import json
+import jsonschema
 
 from django.core.exceptions import ValidationError
 
 
+# Add path to required validator so we can get property name
+def _required(validator, required, instance, schema):
+    '''Validate 'required' properties.'''
+    if not validator.is_type(instance, 'object'):
+        return
+
+    for index, requirement in enumerate(required):
+        if requirement not in instance:
+            error = jsonschema.ValidationError(
+                'This field may not be blank.',
+                path=[requirement]
+            )
+            yield error
+
+
+# Construct validator as extension of Json Schema Draft 4.
+Validator = jsonschema.validators.extend(
+    validator=jsonschema.validators.Draft4Validator,
+    validators={
+        'required': _required
+    }
+)
+
+
 def validate_json(value):
     """
     Validate that a given value can be successfully parsed as JSON.

From 6525129fcbab42144e42842976447c5304ab0d51 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Wed, 13 Jul 2016 08:30:40 -0400
Subject: [PATCH 20/74] Display action form errors

---
 .../control/js/components/RecipeForm.js       | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/normandy/control/static/control/js/components/RecipeForm.js b/normandy/control/static/control/js/components/RecipeForm.js
index 0c762e39..6af3ae76 100644
--- a/normandy/control/static/control/js/components/RecipeForm.js
+++ b/normandy/control/static/control/js/components/RecipeForm.js
@@ -1,7 +1,7 @@
 import React, { PropTypes as pt } from 'react';
 import { Link } from 'react-router';
 import { push } from 'react-router-redux';
-import { destroy, reduxForm, getValues } from 'redux-form';
+import { destroy, stopSubmit, reduxForm, getValues } from 'redux-form';
 import { _ } from 'underscore';
 
 import { makeApiRequest, recipeUpdated, recipeAdded, showNotification }
@@ -64,7 +64,6 @@ export class RecipeForm extends React.Component {
     const recipeFormValues = getValues(formState.recipe);
     const actionFormValues = getValues(formState.action);
     const combinedFormValues = { ...recipeFormValues, arguments: actionFormValues };
-
     const requestBody = { recipe: combinedFormValues, recipeId };
 
     return this.validateForm(combinedFormValues)
@@ -155,10 +154,37 @@ export default composeRecipeContainer(reduxForm({
     ? props.location.state.selectedRevision
     : null;
 
+  const formatErrors = payload => {
+    let errors = payload;
+
+    if (_.isObject(payload)) {
+      const invalidFields = Object.keys(payload);
+      if (invalidFields.length > 0) {
+        errors = isNaN(invalidFields[0]) ? {} : [];
+
+        invalidFields.forEach(fieldName => {
+          errors[fieldName] = formatErrors(payload[fieldName]);
+        });
+      }
+    }
+
+    return errors;
+  };
+
+  const onSubmitFail = errors => {
+    const { dispatch } = props;
+    const actionFormErrors = errors['arguments']; // eslint-disable-line dot-notation
+
+    if (actionFormErrors) {
+      dispatch(stopSubmit('action', formatErrors(actionFormErrors)));
+    }
+  };
+
   return {
     fields,
     initialValues: selectedRecipeRevision || props.recipe,
     viewingRevision: selectedRecipeRevision || props.location.query.revisionId,
     formState: state.form,
+    onSubmitFail,
   };
 })(RecipeForm));

From 2d05ede4db8bf80834e04ffb5f9d0ec11982851d Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Wed, 13 Jul 2016 14:23:02 -0400
Subject: [PATCH 21/74] Check for empty strings in required validator

---
 normandy/recipes/validators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/normandy/recipes/validators.py b/normandy/recipes/validators.py
index 52a7f07b..76d7dae7 100644
--- a/normandy/recipes/validators.py
+++ b/normandy/recipes/validators.py
@@ -11,7 +11,7 @@ def _required(validator, required, instance, schema):
         return
 
     for index, requirement in enumerate(required):
-        if requirement not in instance:
+        if requirement not in instance or instance[requirement] == '':
             error = jsonschema.ValidationError(
                 'This field may not be blank.',
                 path=[requirement]

From 7cea45418b6216dc6dc6e97afbc52c6e0eafb166 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Thu, 14 Jul 2016 11:33:58 -0400
Subject: [PATCH 22/74] Normalize weight field from string to integer

---
 .../components/action_forms/HeartbeatForm.js  | 28 ++++++++-----
 .../form_fields/FormFieldWrapper.js           |  7 ++++
 .../js/components/form_fields/NumberField.js  | 42 +++++++++++++++++++
 3 files changed, 66 insertions(+), 11 deletions(-)
 create mode 100644 normandy/control/static/control/js/components/form_fields/NumberField.js

diff --git a/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js b/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js
index 485d9b86..67bd7ef2 100644
--- a/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js
+++ b/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js
@@ -21,8 +21,6 @@ export const HeartbeatFormFields = [
   'surveys[].weight',
 ];
 
-const formatLabel = labelName => labelName.replace(/([A-Z])/g, ' $1').toLowerCase();
-
 const SurveyListItem = props => {
   const { survey, surveyIndex, isSelected, deleteSurvey, onClick } = props;
   return (
@@ -51,9 +49,11 @@ const SurveyForm = props => {
   const { selectedSurvey, fields, showDefaults } = props;
   const surveyObject = selectedSurvey || fields.defaults;
   let headerText = 'Default Survey Values';
+  let showAdditionalSurveyFields = false;
   let containerClasses = classNames('fluid-8', { active: selectedSurvey });
 
   if (selectedSurvey) {
+    showAdditionalSurveyFields = true;
     headerText = selectedSurvey.title.initialValue || 'New survey';
   }
 
@@ -65,16 +65,22 @@ const SurveyForm = props => {
         </span>
       }
       <h4>{headerText}</h4>
-      {
-        Object.keys(surveyObject).map(fieldName =>
-          <FormField
-            key={fieldName}
-            label={formatLabel(fieldName)}
-            type="text"
-            field={surveyObject[fieldName]}
-          />
-        )
+
+      {showAdditionalSurveyFields &&
+        <FormField label="Title" field={surveyObject.title} />
       }
+
+      <FormField label="Message" field={surveyObject.message} />
+      <FormField label="Engagement Button Label" field={surveyObject.engagementButtonLabel} />
+      <FormField label="Thanks Message" field={surveyObject.thanksMessage} />
+      <FormField label="Post Answer Url" field={surveyObject.postAnswerUrl} />
+      <FormField label="Learn More Message" field={surveyObject.learnMoreMessage} />
+      <FormField label="Learn More Url" field={surveyObject.learnMoreUrl} />
+
+      {showAdditionalSurveyFields &&
+        <FormField label="Weight" type="number" min="1" field={surveyObject.weight} />
+      }
+
     </div>
   );
 };
diff --git a/normandy/control/static/control/js/components/form_fields/FormFieldWrapper.js b/normandy/control/static/control/js/components/form_fields/FormFieldWrapper.js
index 0440ba05..d4ee08de 100644
--- a/normandy/control/static/control/js/components/form_fields/FormFieldWrapper.js
+++ b/normandy/control/static/control/js/components/form_fields/FormFieldWrapper.js
@@ -1,4 +1,5 @@
 import React, { PropTypes as pt } from 'react';
+import NumberField from './NumberField.js';
 
 const SelectMenu = props => {
   const { options, onChange, field } = props;
@@ -26,6 +27,9 @@ const FormField = props => {
     case 'text':
       fieldType = (<input type="text" field={field} {...field} />);
       break;
+    case 'number':
+      fieldType = (<NumberField {...props} />);
+      break;
     case 'textarea':
       fieldType = (<textarea field={field} {...field} />);
       break;
@@ -48,5 +52,8 @@ FormField.propTypes = {
   field: pt.object.isRequired,
   containerClass: pt.string.isRequired,
 };
+FormField.defaultProps = {
+  type: 'text',
+};
 
 export default FormField;
diff --git a/normandy/control/static/control/js/components/form_fields/NumberField.js b/normandy/control/static/control/js/components/form_fields/NumberField.js
new file mode 100644
index 00000000..5feb4607
--- /dev/null
+++ b/normandy/control/static/control/js/components/form_fields/NumberField.js
@@ -0,0 +1,42 @@
+import React, { PropTypes as pt } from 'react';
+
+export default class NumberField extends React.Component {
+  static propTypes = {
+    field: pt.object.isRequired,
+    normalize: pt.func,
+    onBlur: pt.func,
+    onChange: pt.func,
+  }
+
+  static defaultProps = {
+    normalize: value => value && parseInt(value, 10),
+  }
+
+  /* Swallow redux-form's onBlur() so it doesn't reset value to string */
+  handleBlur() {
+    if (this.props.onBlur) {
+      this.props.onBlur();
+    }
+  }
+
+  /* Trigger redux-form's onChange() after parsing value to integer */
+  handleChange(event) {
+    const { normalize, field } = this.props;
+    const value = event.target.value;
+
+    field.onChange(normalize(value));
+  }
+
+  render() {
+    const { field } = this.props;
+
+    return (
+      <input
+        type="number"
+        {...field}
+        onBlur={::this.handleBlur}
+        onChange={::this.handleChange}
+      />
+    );
+  }
+}

From 96375e08b7f571ea4c406938bc0b844f25f6548e Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Thu, 14 Jul 2016 11:58:36 -0400
Subject: [PATCH 23/74] Add indicator to survey list item if it has errors

---
 .../control/static/control/admin/sass/control.scss | 14 ++++++++++++++
 .../js/components/action_forms/HeartbeatForm.js    |  7 +++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/normandy/control/static/control/admin/sass/control.scss b/normandy/control/static/control/admin/sass/control.scss
index afd7a52b..181f18f3 100644
--- a/normandy/control/static/control/admin/sass/control.scss
+++ b/normandy/control/static/control/admin/sass/control.scss
@@ -276,6 +276,20 @@
           padding: 5px 3em;
         }
 
+        &.invalid {
+          color: $red;
+          font-weight: 700;
+
+          &:before {
+            border: none;
+            color: $red;
+            content: "\f071";
+            font: normal normal 400 11px/1 FontAwesome;
+            left: -1.5em;
+            margin-right: 4px;
+          }
+        }
+
         &:before {
           border-color: transparent $darkBrown;
           border-style: solid;
diff --git a/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js b/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js
index 67bd7ef2..b03f992c 100644
--- a/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js
+++ b/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js
@@ -22,9 +22,10 @@ export const HeartbeatFormFields = [
 ];
 
 const SurveyListItem = props => {
-  const { survey, surveyIndex, isSelected, deleteSurvey, onClick } = props;
+  const { survey, surveyIndex, isSelected, hasErrors, deleteSurvey, onClick } = props;
+
   return (
-    <li className={classNames({ active: isSelected })} onClick={onClick}>
+    <li className={classNames({ active: isSelected, invalid: hasErrors })} onClick={onClick}>
       {survey.title.value || 'Untitled Survey'}
       <span
         title="Delete this survey"
@@ -41,6 +42,7 @@ SurveyListItem.propTypes = {
   survey: pt.object.isRequired,
   surveyIndex: pt.number.isRequired,
   isSelected: pt.bool.isRequired,
+  hasErrors: pt.bool.isRequired,
   deleteSurvey: pt.func.isRequired,
   onClick: pt.func,
 };
@@ -147,6 +149,7 @@ class HeartbeatForm extends React.Component {
                       survey={survey}
                       surveyIndex={index}
                       isSelected={_.isEqual(survey, selectedSurvey)}
+                      hasErrors={_.some(survey, field => field.invalid)}
                       onClick={() => ::this.setSelectedSurvey(survey)}
                       deleteSurvey={::this.deleteSurvey}
                     />

From 68369eb43b94985f24f722399663a07608e362b3 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Fri, 15 Jul 2016 12:03:59 -0400
Subject: [PATCH 24/74] Add serializer test for validate_arguments

---
 normandy/recipes/tests/test_serializers.py | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/normandy/recipes/tests/test_serializers.py b/normandy/recipes/tests/test_serializers.py
index 4599c7a0..e39dc67c 100644
--- a/normandy/recipes/tests/test_serializers.py
+++ b/normandy/recipes/tests/test_serializers.py
@@ -1,4 +1,7 @@
 import pytest
+from rest_framework import serializers
+
+import json
 
 from normandy.base.tests import Whatever
 from normandy.recipes.tests import RecipeFactory, ActionFactory
@@ -28,6 +31,46 @@ class TestRecipeSerializer:
             'is_approved': recipe.is_approved
         }
 
+    def test_it_validates_arguments(self):
+        schema = json.loads(
+            open('normandy/recipes/static/actions/console-log/package.json').read()
+        )
+
+        ActionFactory(
+            name='console-log',
+            arguments_schema=schema['normandy']['argumentsSchema']
+        )
+
+        # If the action specified cannot be found, raise validation
+        # error indicating the arguments schema could not be loaded
+        serializer = RecipeSerializer(data={
+            'action': 'action-that-doesnt-exist', 'arguments': {}
+        })
+
+        serializer.is_valid()
+        assert serializer.errors['arguments'] == ['Could not find arguments schema.']
+        assert pytest.raises(serializers.ValidationError)
+
+        # If the action can be found, raise validation error
+        # with the arguments error formatted appropriately
+        serializer = RecipeSerializer(data={
+            'action': 'console-log', 'arguments': {'message': ''}
+        })
+
+        serializer.is_valid()
+        assert serializer.errors['arguments'] == {'message': 'This field may not be blank.'}
+        assert pytest.raises(serializers.ValidationError)
+
+        # If the action can be found, and the arguments passed
+        # are accurate, serializer should be valid
+        serializer = RecipeSerializer(data={
+            'name': 'bar', 'enabled': True, 'filter_expression': True,
+            'action': 'console-log', 'arguments': {'message': 'foo'}
+        })
+
+        serializer.is_valid()
+        assert serializer.errors == {}
+
 
 @pytest.mark.django_db()
 class TestActionSerializer:

From d3459220e738032c181ebe54e003efaa1eb10d4d Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Fri, 15 Jul 2016 09:56:57 -0700
Subject: [PATCH 25/74] Do not render the control app on the login page.

This fixes a bug where the login page showed the 404 page of the
control app since the login page is separate from the frontend app.
---
 .../control/templates/control/admin/base.html |  9 +++++---
 .../templates/control/admin/login.html        |  3 +++
 normandy/control/urls.py                      | 23 +++++++++++++++----
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/normandy/control/templates/control/admin/base.html b/normandy/control/templates/control/admin/base.html
index 6ab06625..24b89566 100644
--- a/normandy/control/templates/control/admin/base.html
+++ b/normandy/control/templates/control/admin/base.html
@@ -26,11 +26,14 @@
       </div>
 
       {% block page-header %}{% endblock %}
-      {% block content %}{% endblock %}
-      <div id="page-container"></div>
+      {% block content %}
+        <div id="page-container"></div>
+      {% endblock %}
 
     </div>
     <!-- END Container -->
-    {% render_bundle 'control' 'js' %}
+    {% block javascript %}
+      {% render_bundle 'control' 'js' %}
+    {% endblock %}
   </body>
 </html>
diff --git a/normandy/control/templates/control/admin/login.html b/normandy/control/templates/control/admin/login.html
index c528f4ce..14c3b2db 100644
--- a/normandy/control/templates/control/admin/login.html
+++ b/normandy/control/templates/control/admin/login.html
@@ -8,6 +8,9 @@
   </div>
 {% endblock %}
 
+{# Do not render the frontend app on the login page. #}
+{% block javascript %}{% endblock %}
+
 {% block content %}
   <div id="content" class="wrapper">
     {% if form.errors and not form.non_field_errors %}
diff --git a/normandy/control/urls.py b/normandy/control/urls.py
index d5d6cea4..bcfe27af 100644
--- a/normandy/control/urls.py
+++ b/normandy/control/urls.py
@@ -1,17 +1,30 @@
 from django.conf import settings
 from django.conf.urls import url, include
-
-from normandy.control import views as control_views
 from django.contrib.auth.views import login, logout_then_login
+from django.core.urlresolvers import reverse_lazy
+
+from normandy.control import views
+
 
 app_name = 'control'
 urlpatterns = []
 
+
 if settings.ADMIN_ENABLED:
     urlpatterns += [
         url(r'^control/', include([
-            url('login', login, {'template_name': 'control/admin/login.html'}, name='login'),
-            url('logout', logout_then_login, {'login_url': '/control/login.html'}, name='logout'),
-            url(r'^.*$', control_views.IndexView, name='index'),
+            url(
+                'login',
+                login,
+                {'template_name': 'control/admin/login.html'},
+                name='login'
+            ),
+            url(
+                'logout',
+                logout_then_login,
+                {'login_url': reverse_lazy('control:login')},
+                name='logout'
+            ),
+            url(r'^.*$', views.IndexView, name='index'),
         ]))
     ]

From bd26a2cc0e1ba29150d8701659861586bfa124a3 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Fri, 15 Jul 2016 14:52:06 -0700
Subject: [PATCH 26/74] Add userId and recipe to filter expression context for
 self-repair.

Fixes bug 1286896
---
 .../static/js/self_repair_runner.js           | 44 +++++++++----------
 .../tests/test_self_repair_runner.js          | 27 ++++++++++++
 2 files changed, 49 insertions(+), 22 deletions(-)
 create mode 100644 normandy/selfrepair/tests/test_self_repair_runner.js

diff --git a/normandy/selfrepair/static/js/self_repair_runner.js b/normandy/selfrepair/static/js/self_repair_runner.js
index cccd9ddd..728b783e 100644
--- a/normandy/selfrepair/static/js/self_repair_runner.js
+++ b/normandy/selfrepair/static/js/self_repair_runner.js
@@ -65,30 +65,24 @@ export function fetchRecipes() {
   const data = { enabled: 'True' };
 
   return fetch(recipeUrl, { headers, data })
-    .then(response => response.json())
-    .then(recipes => recipes);
+  .then(response => response.json());
 }
 
 
 /**
- * Fetch client information from the Normandy server and the driver.
+ * Fetch client information from the Normandy server.
  * @promise Resolves with an object containing client info.
  */
-function classifyClient(driver) {
+export function classifyClient() {
   const { classifyUrl } = document.documentElement.dataset;
   const headers = { Accept: 'application/json' };
-  const classifyXhr = fetch(classifyUrl, { headers })
-    .then(response => response.json())
-    .then(client => client);
 
-  return Promise.all([classifyXhr, driver.client()])
-  .then(([classification, client]) => {
-      // Parse request time
+  return fetch(classifyUrl, { headers })
+  .then(response => response.json())
+  .then(classification => {
+    // Parse request time
     classification.request_time = new Date(classification.request_time);
-
-    return Object.assign({
-      locale: driver.locale,
-    }, classification, client);
+    return classification;
   });
 }
 
@@ -114,11 +108,18 @@ export function runRecipe(recipe, driver, options = {}) {
  * Generate a context object for JEXL filter expressions.
  * @return {object}
  */
-export function filterContext(driver) {
-  return classifyClient(driver)
-  .then(classifiedClient => ({
-    normandy: classifiedClient,
-  }));
+export async function filterContext(driver) {
+  const classification = await classifyClient();
+  const client = await driver.client();
+
+  return {
+    normandy: {
+      locale: driver.locale,
+      userId: getUserId(),
+      ...client,
+      ...classification,
+    },
+  };
 }
 
 
@@ -130,7 +131,6 @@ export function filterContext(driver) {
  *     signifying if the filter passed or failed.
  */
 export function doesRecipeMatch(recipe, context) {
-    // Remove newlines, which are invalid in JEXL
-  const jexlEnv = new JexlEnvironment(context);
-  return jexlEnv.eval(recipe.filterExpression).then(value => [recipe, !!value]);
+  const jexlEnv = new JexlEnvironment({ recipe, ...context });
+  return jexlEnv.eval(recipe.filter_expression).then(value => [recipe, !!value]);
 }
diff --git a/normandy/selfrepair/tests/test_self_repair_runner.js b/normandy/selfrepair/tests/test_self_repair_runner.js
new file mode 100644
index 00000000..4e79f82c
--- /dev/null
+++ b/normandy/selfrepair/tests/test_self_repair_runner.js
@@ -0,0 +1,27 @@
+import fetchMock from 'fetch-mock';
+
+import { classifyClient } from '../static/js/self_repair_runner.js';
+
+describe('Self-Repair Runner', () => {
+  afterEach(() => {
+    fetchMock.restore();
+  });
+
+  describe('classifyClient', () => {
+    it('should make a request to the normandy server', async () => {
+      const url = '/api/v1/classify/';
+      const requestTime = '2016-01-01';
+      document.documentElement.dataset.classifyUrl = url;
+      fetchMock.mock(url, 'GET', {
+        request_time: requestTime,
+        country: 'US',
+      });
+
+      expect(await classifyClient()).toEqual(jasmine.objectContaining({
+        request_time: new Date(requestTime),
+        country: 'US',
+      }));
+      expect(fetchMock.lastUrl()).toEqual(url);
+    });
+  });
+});

From bf2f3ab37c6ed7ef6ed1dc31618c20ee8c605706 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Mon, 18 Jul 2016 13:18:02 -0700
Subject: [PATCH 27/74] Upgrade to Django 1.9.8

Fixes bug 1287583
---
 requirements.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ecd81308..300bffa9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,9 +30,9 @@ django-storages-redux==1.3.2 \
     --hash=sha256:84cb0e685ac0401f14d320d3d469b3e5968a7314a93936c86672c2315d8302dc
 django-webpack-loader==0.3.0 \
     --hash=sha256:729c8d1b0d3f1449a2f7964c7e5351d0494bbe0470afdf9570e26593ac75fe13
-Django==1.9 \
-    --hash=sha256:e66d58bfeed3a5eb44f2af6d5f1b6a85d656c4180ebba63b692e58d29db2a716 \
-    --hash=sha256:05fe4b19a8778d4b48bbf1f4dfca3106881fea7982664553e7f7f861606f7c66
+django==1.9.8 \
+    --hash=sha256:e50c8d4653433413d26ecf25a84ccdcb9c7eac7cd1bb36eed4cd89c71f43064e \
+    --hash=sha256:b9806e0d598fd04b29b8ef35aea8c9308b3803c3ce8adab4d342db9cdfd42dfb
 djangorestframework==3.3.2 \
     --hash=sha256:5634b1ff56581bf0fe4075e86227fc9693c1ca031c7213c9ae942c445c24817b \
     --hash=sha256:4962418a57804f8323282728a4f9b9496e78caec1adda352170697752eff01bf

From 064c62687a5be80fbaf32e909ac5f63b0019eae8 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Mon, 18 Jul 2016 16:43:14 -0700
Subject: [PATCH 28/74] Tests!

---
 .../tests/test_self_repair_runner.js          | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/normandy/selfrepair/tests/test_self_repair_runner.js b/normandy/selfrepair/tests/test_self_repair_runner.js
index 4e79f82c..65bf66f4 100644
--- a/normandy/selfrepair/tests/test_self_repair_runner.js
+++ b/normandy/selfrepair/tests/test_self_repair_runner.js
@@ -1,6 +1,11 @@
 import fetchMock from 'fetch-mock';
+import { mockNormandy } from '../../recipes/tests/actions/utils.js';
+
+import { classifyClient, doesRecipeMatch, filterContext } from '../static/js/self_repair_runner.js';
+
+
+const UUID_ISH_REGEX = /^[a-f0-9-]{36}$/;
 
-import { classifyClient } from '../static/js/self_repair_runner.js';
 
 describe('Self-Repair Runner', () => {
   afterEach(() => {
@@ -24,4 +29,36 @@ describe('Self-Repair Runner', () => {
       expect(fetchMock.lastUrl()).toEqual(url);
     });
   });
+
+  describe('filterContext', () => {
+    it('should contain a valid user ID', async () => {
+      document.documentElement.dataset.classifyUrl = '/api/v1/classify/';
+      fetchMock.mock('/api/v1/classify/', 'GET', {
+        request_time: '2016-01-01',
+        country: 'US',
+      });
+
+      const driver = mockNormandy();
+      const context = await filterContext(driver);
+      expect(context.normandy.userId).toBeDefined();
+      expect(UUID_ISH_REGEX.test(context.normandy.userId)).toBe(true);
+    });
+  });
+
+  describe('doesRecipeMatch', () => {
+    it('should include the recipe in the filter expression context', async () => {
+      const recipe = {
+        filter_expression: 'recipe.shouldPass',
+        shouldPass: true,
+      };
+
+      let match = await doesRecipeMatch(recipe, {});
+      expect(match[1]).toBe(true);
+
+      // If shouldPass changes, so should the filter expression's result
+      recipe.shouldPass = false;
+      match = await doesRecipeMatch(recipe, {});
+      expect(match[1]).toBe(false);
+    });
+  });
 });

From 6f00cd999e54e24df602991f5b73d39da3a4869f Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 05:11:25 -0400
Subject: [PATCH 29/74] Rename Validator to JSONSchemaValidator

---
 normandy/recipes/api/serializers.py | 4 ++--
 normandy/recipes/validators.py      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/normandy/recipes/api/serializers.py b/normandy/recipes/api/serializers.py
index b2654016..4b8be8a6 100644
--- a/normandy/recipes/api/serializers.py
+++ b/normandy/recipes/api/serializers.py
@@ -7,7 +7,7 @@ from normandy.base.api.serializers import UserSerializer
 from normandy.recipes.api.fields import ActionImplementationHyperlinkField
 from normandy.recipes.models import (Action, Recipe, Approval, ApprovalRequest,
                                      ApprovalRequestComment)
-from normandy.recipes.validators import Validator
+from normandy.recipes.validators import JSONSchemaValidator
 
 
 class ActionSerializer(serializers.ModelSerializer):
@@ -110,7 +110,7 @@ class RecipeSerializer(serializers.ModelSerializer):
         except:
             raise serializers.ValidationError('Could not find arguments schema.')
 
-        schemaValidator = Validator(schema)
+        schemaValidator = JSONSchemaValidator(schema)
         errorResponse = {}
         errors = sorted(schemaValidator.iter_errors(value), key=lambda e: e.path)
 
diff --git a/normandy/recipes/validators.py b/normandy/recipes/validators.py
index 76d7dae7..30d5ebce 100644
--- a/normandy/recipes/validators.py
+++ b/normandy/recipes/validators.py
@@ -20,7 +20,7 @@ def _required(validator, required, instance, schema):
 
 
 # Construct validator as extension of Json Schema Draft 4.
-Validator = jsonschema.validators.extend(
+JSONSchemaValidator = jsonschema.validators.extend(
     validator=jsonschema.validators.Draft4Validator,
     validators={
         'required': _required

From 34be718d554b7a1563e253710bc6d70cd81d77bd Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 05:12:19 -0400
Subject: [PATCH 30/74] Use triple double quotes rather than single

---
 normandy/recipes/validators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/normandy/recipes/validators.py b/normandy/recipes/validators.py
index 30d5ebce..53b9e0c2 100644
--- a/normandy/recipes/validators.py
+++ b/normandy/recipes/validators.py
@@ -6,7 +6,7 @@ from django.core.exceptions import ValidationError
 
 # Add path to required validator so we can get property name
 def _required(validator, required, instance, schema):
-    '''Validate 'required' properties.'''
+    """Validate 'required' properties."""
     if not validator.is_type(instance, 'object'):
         return
 

From d9b4268ca871425c1d9fd69b8331b715acf183c8 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 05:13:02 -0400
Subject: [PATCH 31/74] Rewrite required value check

---
 normandy/recipes/validators.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/normandy/recipes/validators.py b/normandy/recipes/validators.py
index 53b9e0c2..0a873235 100644
--- a/normandy/recipes/validators.py
+++ b/normandy/recipes/validators.py
@@ -5,13 +5,13 @@ from django.core.exceptions import ValidationError
 
 
 # Add path to required validator so we can get property name
-def _required(validator, required, instance, schema):
+def _required(validator, requirements, instance, schema):
     """Validate 'required' properties."""
     if not validator.is_type(instance, 'object'):
         return
 
-    for index, requirement in enumerate(required):
-        if requirement not in instance or instance[requirement] == '':
+    for index, requirement in enumerate(requirements):
+        if instance.get(requirement, '') == '':
             error = jsonschema.ValidationError(
                 'This field may not be blank.',
                 path=[requirement]

From d5491e08469a41a37b6d9594920964ca494a1b1f Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 05:14:44 -0400
Subject: [PATCH 32/74] Add comment for error icon

---
 normandy/control/static/control/admin/sass/control.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/normandy/control/static/control/admin/sass/control.scss b/normandy/control/static/control/admin/sass/control.scss
index 181f18f3..03d356cc 100644
--- a/normandy/control/static/control/admin/sass/control.scss
+++ b/normandy/control/static/control/admin/sass/control.scss
@@ -283,7 +283,7 @@
           &:before {
             border: none;
             color: $red;
-            content: "\f071";
+            content: "\f071"; // error icon, fa-exclamation-triangle
             font: normal normal 400 11px/1 FontAwesome;
             left: -1.5em;
             margin-right: 4px;

From cef30c1aaea1a68c6acdca01fb44131ded4fd5d4 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 05:36:17 -0400
Subject: [PATCH 33/74] Remove dot-notation format of errors.arguments

---
 normandy/control/static/control/js/components/RecipeForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/normandy/control/static/control/js/components/RecipeForm.js b/normandy/control/static/control/js/components/RecipeForm.js
index 6af3ae76..02a01e4a 100644
--- a/normandy/control/static/control/js/components/RecipeForm.js
+++ b/normandy/control/static/control/js/components/RecipeForm.js
@@ -173,7 +173,7 @@ export default composeRecipeContainer(reduxForm({
 
   const onSubmitFail = errors => {
     const { dispatch } = props;
-    const actionFormErrors = errors['arguments']; // eslint-disable-line dot-notation
+    const actionFormErrors = errors.arguments;
 
     if (actionFormErrors) {
       dispatch(stopSubmit('action', formatErrors(actionFormErrors)));

From 7558686c5c86587ca361b3b9a3011804923c8613 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 06:14:43 -0400
Subject: [PATCH 34/74] Comment shape of error data in serializer

---
 normandy/recipes/api/serializers.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/normandy/recipes/api/serializers.py b/normandy/recipes/api/serializers.py
index 4b8be8a6..5fb0a539 100644
--- a/normandy/recipes/api/serializers.py
+++ b/normandy/recipes/api/serializers.py
@@ -114,6 +114,10 @@ class RecipeSerializer(serializers.ModelSerializer):
         errorResponse = {}
         errors = sorted(schemaValidator.iter_errors(value), key=lambda e: e.path)
 
+        # Loop through ValidationErrors returned by JSONSchema
+        # Each error contains a message and a path attribute
+        # message: string human-readable error explanation
+        # path: list containing path to offending element
         for error in errors:
             currentLevel = errorResponse
 

From fb821a8e18c6f70dcce917a224463dafbf7c19bb Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 06:59:25 -0400
Subject: [PATCH 35/74] Assert validated_data is accurate

---
 normandy/recipes/tests/test_serializers.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/normandy/recipes/tests/test_serializers.py b/normandy/recipes/tests/test_serializers.py
index e39dc67c..8bef5801 100644
--- a/normandy/recipes/tests/test_serializers.py
+++ b/normandy/recipes/tests/test_serializers.py
@@ -36,7 +36,7 @@ class TestRecipeSerializer:
             open('normandy/recipes/static/actions/console-log/package.json').read()
         )
 
-        ActionFactory(
+        mockAction = ActionFactory(
             name='console-log',
             arguments_schema=schema['normandy']['argumentsSchema']
         )
@@ -64,11 +64,20 @@ class TestRecipeSerializer:
         # If the action can be found, and the arguments passed
         # are accurate, serializer should be valid
         serializer = RecipeSerializer(data={
-            'name': 'bar', 'enabled': True, 'filter_expression': True,
+            'name': 'bar', 'enabled': True, 'filter_expression': '[]',
             'action': 'console-log', 'arguments': {'message': 'foo'}
         })
 
         serializer.is_valid()
+        assert serializer.validated_data == {
+            'name': 'bar',
+            'enabled': True,
+            'filter_expression': '[]',
+            'action': mockAction,
+            'arguments': {
+                'message': 'foo'
+            }
+        }
         assert serializer.errors == {}
 
 

From 98d9423d124f9319219dbb37777139cbdfd81084 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 07:13:41 -0400
Subject: [PATCH 36/74] Comment error data processing/transformation

---
 normandy/control/static/control/js/components/RecipeForm.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/normandy/control/static/control/js/components/RecipeForm.js b/normandy/control/static/control/js/components/RecipeForm.js
index 02a01e4a..9b08f130 100644
--- a/normandy/control/static/control/js/components/RecipeForm.js
+++ b/normandy/control/static/control/js/components/RecipeForm.js
@@ -157,9 +157,15 @@ export default composeRecipeContainer(reduxForm({
   const formatErrors = payload => {
     let errors = payload;
 
+    /* If our payload is an object, process each error in the object
+       Otherwise, it is a string and will be returned immediately */
     if (_.isObject(payload)) {
       const invalidFields = Object.keys(payload);
       if (invalidFields.length > 0) {
+        /* If our error keys are integers, it means they correspond
+           to an array field and we want to present errors as an array
+           e.g. { surveys: {0: {title: 'err'}}, {2: {weight: 'err'}} }
+           =>   { surveys: [{title: 'err'}, null, {weight: 'err'}] } */
         errors = isNaN(invalidFields[0]) ? {} : [];
 
         invalidFields.forEach(fieldName => {

From 44c2bd344cae960856b395a6a0ac7b4a5544d99e Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 08:37:00 -0400
Subject: [PATCH 37/74] Mock schema instead of loading from package.json

---
 normandy/recipes/tests/test_serializers.py | 61 ++++++++++++++++++----
 1 file changed, 50 insertions(+), 11 deletions(-)

diff --git a/normandy/recipes/tests/test_serializers.py b/normandy/recipes/tests/test_serializers.py
index 8bef5801..bcde9180 100644
--- a/normandy/recipes/tests/test_serializers.py
+++ b/normandy/recipes/tests/test_serializers.py
@@ -1,8 +1,6 @@
 import pytest
 from rest_framework import serializers
 
-import json
-
 from normandy.base.tests import Whatever
 from normandy.recipes.tests import RecipeFactory, ActionFactory
 from normandy.recipes.api.serializers import RecipeSerializer, ActionSerializer
@@ -32,13 +30,27 @@ class TestRecipeSerializer:
         }
 
     def test_it_validates_arguments(self):
-        schema = json.loads(
-            open('normandy/recipes/static/actions/console-log/package.json').read()
-        )
+        schema = {
+            "required": ["surveyId", "surveys"],
+            "properties": {
+                "surveyId": {"type": "string"},
+                "surveys": {
+                    "type": "array",
+                    "minItems": 1,
+                    "items": {
+                        "properties": {
+                            "title": {"type": "string"},
+                            "weight": {"type": "integer", "minimum": 1}
+                        },
+                        "required": ["title", "weight"]
+                    },
+                }
+            }
+        }
 
         mockAction = ActionFactory(
-            name='console-log',
-            arguments_schema=schema['normandy']['argumentsSchema']
+            name='show-heartbeat',
+            arguments_schema=schema
         )
 
         # If the action specified cannot be found, raise validation
@@ -54,18 +66,41 @@ class TestRecipeSerializer:
         # If the action can be found, raise validation error
         # with the arguments error formatted appropriately
         serializer = RecipeSerializer(data={
-            'action': 'console-log', 'arguments': {'message': ''}
+            'action': 'show-heartbeat',
+            'arguments': {
+                'surveyId': '',
+                'surveys': [
+                    {'title': '', 'weight': 1},
+                    {'title': 'bar', 'weight': 1},
+                    {'title': 'foo', 'weight': 0},
+                    {'title': 'baz', 'weight': 'lorem ipsum'}
+                ]
+            }
         })
 
         serializer.is_valid()
-        assert serializer.errors['arguments'] == {'message': 'This field may not be blank.'}
+        assert serializer.errors['arguments'] == {
+            'surveyId': 'This field may not be blank.',
+            'surveys': {
+                0: {'title': 'This field may not be blank.'},
+                2: {'weight': '0 is less than the minimum of 1'},
+                3: {'weight': '\'lorem ipsum\' is not of type \'integer\''}
+            }
+        }
         assert pytest.raises(serializers.ValidationError)
 
         # If the action can be found, and the arguments passed
         # are accurate, serializer should be valid
         serializer = RecipeSerializer(data={
             'name': 'bar', 'enabled': True, 'filter_expression': '[]',
-            'action': 'console-log', 'arguments': {'message': 'foo'}
+            'action': 'show-heartbeat',
+            'arguments': {
+                'surveyId': 'lorem-ipsum-dolor',
+                'surveys': [
+                    {'title': 'adipscing', 'weight': 1},
+                    {'title': 'consequetar', 'weight': 1}
+                ]
+            }
         })
 
         serializer.is_valid()
@@ -75,7 +110,11 @@ class TestRecipeSerializer:
             'filter_expression': '[]',
             'action': mockAction,
             'arguments': {
-                'message': 'foo'
+                'surveyId': 'lorem-ipsum-dolor',
+                'surveys': [
+                    {'title': 'adipscing', 'weight': 1},
+                    {'title': 'consequetar', 'weight': 1}
+                ]
             }
         }
         assert serializer.errors == {}

From 06d99ed3bee7d041816903b17f6602458452d436 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 08:58:15 -0400
Subject: [PATCH 38/74] Fix assertions when raising exceptions

---
 normandy/recipes/tests/test_serializers.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/normandy/recipes/tests/test_serializers.py b/normandy/recipes/tests/test_serializers.py
index bcde9180..449a092d 100644
--- a/normandy/recipes/tests/test_serializers.py
+++ b/normandy/recipes/tests/test_serializers.py
@@ -59,9 +59,10 @@ class TestRecipeSerializer:
             'action': 'action-that-doesnt-exist', 'arguments': {}
         })
 
-        serializer.is_valid()
+        with pytest.raises(serializers.ValidationError):
+            serializer.is_valid(raise_exception=True)
+
         assert serializer.errors['arguments'] == ['Could not find arguments schema.']
-        assert pytest.raises(serializers.ValidationError)
 
         # If the action can be found, raise validation error
         # with the arguments error formatted appropriately
@@ -78,7 +79,9 @@ class TestRecipeSerializer:
             }
         })
 
-        serializer.is_valid()
+        with pytest.raises(serializers.ValidationError):
+            serializer.is_valid(raise_exception=True)
+
         assert serializer.errors['arguments'] == {
             'surveyId': 'This field may not be blank.',
             'surveys': {
@@ -87,7 +90,6 @@ class TestRecipeSerializer:
                 3: {'weight': '\'lorem ipsum\' is not of type \'integer\''}
             }
         }
-        assert pytest.raises(serializers.ValidationError)
 
         # If the action can be found, and the arguments passed
         # are accurate, serializer should be valid

From 048e81a629b1a0e6e5d960583ab6b7713b499712 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 09:19:23 -0400
Subject: [PATCH 39/74] Separate out recipe validation test cases

---
 normandy/recipes/tests/test_serializers.py | 79 ++++++++++++++--------
 1 file changed, 49 insertions(+), 30 deletions(-)

diff --git a/normandy/recipes/tests/test_serializers.py b/normandy/recipes/tests/test_serializers.py
index 449a092d..389d3fb8 100644
--- a/normandy/recipes/tests/test_serializers.py
+++ b/normandy/recipes/tests/test_serializers.py
@@ -29,32 +29,9 @@ class TestRecipeSerializer:
             'is_approved': recipe.is_approved
         }
 
-    def test_it_validates_arguments(self):
-        schema = {
-            "required": ["surveyId", "surveys"],
-            "properties": {
-                "surveyId": {"type": "string"},
-                "surveys": {
-                    "type": "array",
-                    "minItems": 1,
-                    "items": {
-                        "properties": {
-                            "title": {"type": "string"},
-                            "weight": {"type": "integer", "minimum": 1}
-                        },
-                        "required": ["title", "weight"]
-                    },
-                }
-            }
-        }
-
-        mockAction = ActionFactory(
-            name='show-heartbeat',
-            arguments_schema=schema
-        )
-
-        # If the action specified cannot be found, raise validation
-        # error indicating the arguments schema could not be loaded
+    # If the action specified cannot be found, raise validation
+    # error indicating the arguments schema could not be loaded
+    def test_validation_with_wrong_action(self):
         serializer = RecipeSerializer(data={
             'action': 'action-that-doesnt-exist', 'arguments': {}
         })
@@ -64,8 +41,30 @@ class TestRecipeSerializer:
 
         assert serializer.errors['arguments'] == ['Could not find arguments schema.']
 
-        # If the action can be found, raise validation error
-        # with the arguments error formatted appropriately
+    # If the action can be found, raise validation error
+    # with the arguments error formatted appropriately
+    def test_validation_with_wrong_arguments(self):
+        ActionFactory(
+            name='show-heartbeat',
+            arguments_schema={
+                "required": ["surveyId", "surveys"],
+                "properties": {
+                    "surveyId": {"type": "string"},
+                    "surveys": {
+                        "type": "array",
+                        "minItems": 1,
+                        "items": {
+                            "properties": {
+                                "title": {"type": "string"},
+                                "weight": {"type": "integer", "minimum": 1}
+                            },
+                            "required": ["title", "weight"]
+                        },
+                    }
+                }
+            }
+        )
+
         serializer = RecipeSerializer(data={
             'action': 'show-heartbeat',
             'arguments': {
@@ -91,8 +90,28 @@ class TestRecipeSerializer:
             }
         }
 
-        # If the action can be found, and the arguments passed
-        # are accurate, serializer should be valid
+    def test_validation_with_valid_data(self):
+        mockAction = ActionFactory(
+            name='show-heartbeat',
+            arguments_schema={
+                "required": ["surveyId", "surveys"],
+                "properties": {
+                    "surveyId": {"type": "string"},
+                    "surveys": {
+                        "type": "array",
+                        "minItems": 1,
+                        "items": {
+                            "properties": {
+                                "title": {"type": "string"},
+                                "weight": {"type": "integer", "minimum": 1}
+                            },
+                            "required": ["title", "weight"]
+                        },
+                    }
+                }
+            }
+        )
+
         serializer = RecipeSerializer(data={
             'name': 'bar', 'enabled': True, 'filter_expression': '[]',
             'action': 'show-heartbeat',

From 28bed6875617dbaee34dd319f9a513d220aae63f Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 10:10:38 -0400
Subject: [PATCH 40/74] Add API integration test for invalid arguments

---
 normandy/recipes/tests/test_api.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/normandy/recipes/tests/test_api.py b/normandy/recipes/tests/test_api.py
index 44ce0949..ad679699 100644
--- a/normandy/recipes/tests/test_api.py
+++ b/normandy/recipes/tests/test_api.py
@@ -166,6 +166,25 @@ class TestRecipeAPI(object):
         recipes = Recipe.objects.all()
         assert recipes.count() == 0
 
+    def test_creation_when_arguments_are_invalid(self, api_client):
+        ActionFactory(
+            name='foobarbaz',
+            arguments_schema={
+                'type': 'object',
+                'properties': {'message': {'type': 'string'}},
+                'required': ['message']
+            }
+        )
+        res = api_client.post('/api/v1/recipe/', {'name': 'Test Recipe',
+                                                  'enabled': True,
+                                                  'filter_expression': 'true',
+                                                  'action': 'foobarbaz',
+                                                  'arguments': {'message': ''}})
+        assert res.status_code == 400
+
+        recipes = Recipe.objects.all()
+        assert recipes.count() == 0
+
     def test_it_can_change_action_for_recipes(self, api_client):
         recipe = RecipeFactory()
         action = ActionFactory()

From 4d5dc91fb0719f02308fe1699f9dccd07ed02610 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 10:12:27 -0400
Subject: [PATCH 41/74] Assert is_valid()

---
 normandy/recipes/tests/test_serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/normandy/recipes/tests/test_serializers.py b/normandy/recipes/tests/test_serializers.py
index 389d3fb8..b8819285 100644
--- a/normandy/recipes/tests/test_serializers.py
+++ b/normandy/recipes/tests/test_serializers.py
@@ -124,7 +124,7 @@ class TestRecipeSerializer:
             }
         })
 
-        serializer.is_valid()
+        assert serializer.is_valid()
         assert serializer.validated_data == {
             'name': 'bar',
             'enabled': True,

From 307546e51d66ab4f9a66874cf756a949629c932a Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Tue, 19 Jul 2016 10:15:05 -0400
Subject: [PATCH 42/74] Import mock arguments schema

---
 normandy/recipes/tests/__init__.py         | 18 ++++++++++
 normandy/recipes/tests/test_serializers.py | 38 ++--------------------
 2 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/normandy/recipes/tests/__init__.py b/normandy/recipes/tests/__init__.py
index ee5341ef..8c00280d 100644
--- a/normandy/recipes/tests/__init__.py
+++ b/normandy/recipes/tests/__init__.py
@@ -112,3 +112,21 @@ class ClientFactory(factory.Factory):
         model = Client
 
     request = factory.LazyAttribute(lambda o: RequestFactory().get('/'))
+
+ARGUMENTS_SCHEMA = {
+    "required": ["surveyId", "surveys"],
+    "properties": {
+        "surveyId": {"type": "string"},
+        "surveys": {
+            "type": "array",
+            "minItems": 1,
+            "items": {
+                "properties": {
+                    "title": {"type": "string"},
+                    "weight": {"type": "integer", "minimum": 1}
+                },
+                "required": ["title", "weight"]
+            },
+        },
+    },
+}
diff --git a/normandy/recipes/tests/test_serializers.py b/normandy/recipes/tests/test_serializers.py
index b8819285..819c8b73 100644
--- a/normandy/recipes/tests/test_serializers.py
+++ b/normandy/recipes/tests/test_serializers.py
@@ -2,7 +2,7 @@ import pytest
 from rest_framework import serializers
 
 from normandy.base.tests import Whatever
-from normandy.recipes.tests import RecipeFactory, ActionFactory
+from normandy.recipes.tests import RecipeFactory, ActionFactory, ARGUMENTS_SCHEMA
 from normandy.recipes.api.serializers import RecipeSerializer, ActionSerializer
 
 
@@ -46,23 +46,7 @@ class TestRecipeSerializer:
     def test_validation_with_wrong_arguments(self):
         ActionFactory(
             name='show-heartbeat',
-            arguments_schema={
-                "required": ["surveyId", "surveys"],
-                "properties": {
-                    "surveyId": {"type": "string"},
-                    "surveys": {
-                        "type": "array",
-                        "minItems": 1,
-                        "items": {
-                            "properties": {
-                                "title": {"type": "string"},
-                                "weight": {"type": "integer", "minimum": 1}
-                            },
-                            "required": ["title", "weight"]
-                        },
-                    }
-                }
-            }
+            arguments_schema=ARGUMENTS_SCHEMA
         )
 
         serializer = RecipeSerializer(data={
@@ -93,23 +77,7 @@ class TestRecipeSerializer:
     def test_validation_with_valid_data(self):
         mockAction = ActionFactory(
             name='show-heartbeat',
-            arguments_schema={
-                "required": ["surveyId", "surveys"],
-                "properties": {
-                    "surveyId": {"type": "string"},
-                    "surveys": {
-                        "type": "array",
-                        "minItems": 1,
-                        "items": {
-                            "properties": {
-                                "title": {"type": "string"},
-                                "weight": {"type": "integer", "minimum": 1}
-                            },
-                            "required": ["title", "weight"]
-                        },
-                    }
-                }
-            }
+            arguments_schema=ARGUMENTS_SCHEMA
         )
 
         serializer = RecipeSerializer(data={

From e3e54f50b964cf06c925509505a398e789bea5ed Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 20 Jul 2016 11:24:56 -0700
Subject: [PATCH 43/74] Refactor circle.yml docker commands

---
 .../dockerhub.sh => ci/deploy-dockerhub.sh}   |  0
 bin/ci/docker-run                             | 37 +++++++++++++++++++
 bin/{ => ci}/karma-ci.js                      |  0
 circle.yml                                    | 35 +++++++-----------
 4 files changed, 50 insertions(+), 22 deletions(-)
 rename bin/{deploy/dockerhub.sh => ci/deploy-dockerhub.sh} (100%)
 create mode 100755 bin/ci/docker-run
 rename bin/{ => ci}/karma-ci.js (100%)

diff --git a/bin/deploy/dockerhub.sh b/bin/ci/deploy-dockerhub.sh
similarity index 100%
rename from bin/deploy/dockerhub.sh
rename to bin/ci/deploy-dockerhub.sh
diff --git a/bin/ci/docker-run b/bin/ci/docker-run
new file mode 100755
index 00000000..1108c80f
--- /dev/null
+++ b/bin/ci/docker-run
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+set -eu
+
+DOCKER_ARGS=( )
+
+if [[ -v CIRCLE_TEST_REPORTS ]]; then
+  DOCKER_ARGS+=(--volume $CIRCLE_TEST_REPORTS:/test/artifacts)
+fi
+
+if [[ -f ~/cache/GeoLite2-Country.mmdb ]]; then
+  DOCKER_ARGS+=(--volume ~/cache/GeoLite2-Country.mmdb:/app/GeoLite2-Country.mmdb)
+fi
+
+# Parse out known command flags to give to `docker run` instead of the command
+while [ $# -ge 1 ]; do
+  case $1 in
+    --)
+      shift
+      break
+      ;;
+    -p)
+      DOCKER_ARGS+=($1 $2)
+      shift
+      shift
+      ;;
+    *)
+      break
+      ;;
+  esac
+done
+
+echo docker run \
+  --net host \
+  --env DJANGO_CONFIGURATION=Test \
+  "${DOCKER_ARGS[@]}" \
+  normandy:build \
+  "$@"
diff --git a/bin/karma-ci.js b/bin/ci/karma-ci.js
similarity index 100%
rename from bin/karma-ci.js
rename to bin/ci/karma-ci.js
diff --git a/circle.yml b/circle.yml
index edca8bd3..0f7969ed 100644
--- a/circle.yml
+++ b/circle.yml
@@ -23,38 +23,29 @@ test:
     - chmod -R 777 $CIRCLE_TEST_REPORTS
   override:
     # Run Python lint checks
-    - >
-      docker run --net host
-      -v $CIRCLE_TEST_REPORTS:/test_artifacts
-      normandy:build flake8 --output-file /test_artifacts/flake8.txt normandy
+    - bin/ci/docker-run flake8 --output-file /test_artifacts/flake8.txt normandy
     # Run JS lint checks
-    - >
-      docker run --net host
-      -v $CIRCLE_TEST_REPORTS:/test_artifacts
-      normandy:build node_modules/.bin/eslint normandy --format junit --output-file /test_artifacts/eslint.xml
+    - bin/ci/docker-run npm run lint -- --format junit --output-file /test_artifacts/eslint.xml
     # Run Python tests
-    - >
-      docker run --net host -e DJANGO_CONFIGURATION=Test
-      -v $CIRCLE_TEST_REPORTS:/test_artifacts
-      -v ~/cache/GeoLite2-Country.mmdb:/app/GeoLite2-Country.mmdb
-      normandy:build py.test --junitxml=/test_artifacts/pytest.xml normandy/
+    - bin/ci/docker-run py.test --junitxml=/test_artifacts/pytest.xml normandy/
     # Start Karma test server, and run them in Firefox
     - >
       (
+        echo Waiting for Karma server to start;
         docker run --net host -e CHECK_PORT=9876 -e CHECK_HOST=localhost giorgos/takis;
         echo Starting Firefox;
         firefox localhost:9876
       ) &
-      docker run --net host -p 9876:9876
-      -v $CIRCLE_TEST_REPORTS:/test_artifacts
-      normandy:build node bin/karma-ci.js
+      bin/ci/docker-run -p 9876:9876 node bin/ci/karma-ci.js
   post:
     # Save test artifacts for Python and Lint tests
-    - >
-      docker run -v $CIRCLE_TEST_REPORTS:/test_artifacts
-      normandy:build flake8_junit /test_artifacts/flake8.txt /test_artifacts/flake8.xml
+    - bin/ci/docker-run flake8_junit /test_artifacts/flake8.txt /test_artifacts/flake8.xml
     # Clean up old image and save the new one
-    - mkdir -p ~/cache/docker; test '!' -e ~/cache/docker/image.tar || rm ~/cache/docker/image.tar; docker save normandy:build > ~/cache/docker/image.tar; ls -l ~/cache/docker
+    - >
+      mkdir -p ~/cache/docker;
+      rm -f ~/cache/docker/image.tar;
+      docker save normandy:build > ~/cache/docker/image.tar;
+      ls -l ~/cache/docker
 
 # appropriately tag and push the container to dockerhub
 deployment:
@@ -63,7 +54,7 @@ deployment:
     commands:
       # set DOCKER_DEPLOY=true in Circle UI to do deploys
       - "${DOCKER_DEPLOY:-false}"
-      - bin/deploy/dockerhub.sh latest
+      - bin/ci/deply-dockerhub.sh latest
 
   tags:
     # push all tags
@@ -71,4 +62,4 @@ deployment:
     commands:
       # set DOCKER_DEPLOY=true in Circle UI to do deploys
       - "${DOCKER_DEPLOY:-false}"
-      - bin/deploy/dockerhub.sh "$CIRCLE_TAG"
+      - bin/ci/deply-dockerhub.sh "$CIRCLE_TAG"

From eb64c490cfce36a889f0c0802aa29bfd1a9b6fc6 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 20 Jul 2016 14:47:39 -0700
Subject: [PATCH 44/74] Refactor contract-tests to target arbitrary server urls

---
 bin/runsslserver.sh        |  2 +-
 conftest.py                | 17 -------
 contract-tests/conftest.py | 44 ++++++++++++++++++
 contract-tests/test_api.py | 95 +++++++++++++++-----------------------
 4 files changed, 82 insertions(+), 76 deletions(-)
 delete mode 100644 conftest.py
 create mode 100644 contract-tests/conftest.py

diff --git a/bin/runsslserver.sh b/bin/runsslserver.sh
index 75030f63..d75ae7d6 100755
--- a/bin/runsslserver.sh
+++ b/bin/runsslserver.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This script starts an SSL development server so that you don't have to
 # pass annoying arguments to manage.py all the time.
 BASE_DIR="$(dirname "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )")"
diff --git a/conftest.py b/conftest.py
deleted file mode 100644
index ea91cc78..00000000
--- a/conftest.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration file for running our tests
-import pytest
-
-
-def pytest_addoption(parser):
-    parser.addoption(
-        "--env",
-        action="store",
-        required=False,
-        default="dev",
-        help="Choose a test environment: dev, stage, or prod",
-    )
-
-
-@pytest.fixture
-def env(request):
-    return request.config.getoption("--env")
diff --git a/contract-tests/conftest.py b/contract-tests/conftest.py
new file mode 100644
index 00000000..3f2e1197
--- /dev/null
+++ b/contract-tests/conftest.py
@@ -0,0 +1,44 @@
+# Configuration file for running contract-tests
+import pytest
+import requests
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--server",
+        dest="server",
+        default="http://localhost:8000",
+        help="Server to run tests against"
+    )
+    parser.addoption(
+        "--no-verify",
+        action="store_false",
+        dest="verify",
+        default=None,
+        help="Server to run tests against"
+    )
+
+
+@pytest.fixture
+def conf(request):
+    return request.config
+
+
+class RequestVerifyWrapper(object):
+    """
+    `request.Session` doesn't have a way to permanently change the verify flag. This provides that.
+    """
+    def __init__(self, verify):
+        self.verify = verify
+        self.session = requests.Session()
+
+    def get(self, *args, **kwargs):
+        return self.session.get(*args, verify=self.verify, **kwargs)
+
+    # TODO: Add other HTTP methods as needed
+
+
+@pytest.fixture
+def requests_session(conf):
+    verify = conf.getoption('verify')
+    return RequestVerifyWrapper(verify)
diff --git a/contract-tests/test_api.py b/contract-tests/test_api.py
index 65a28943..71d45154 100644
--- a/contract-tests/test_api.py
+++ b/contract-tests/test_api.py
@@ -1,26 +1,9 @@
-import configparser
 import jsonschema
 import pytest
-import requests
 
 
-@pytest.fixture
-def conf():
-    config = configparser.ConfigParser()
-    config.read('manifest.ini')
-    return config
-
-
-def filter_show_heartbeat(record):
-    return record['name'] == 'show-heartbeat'
-
-
-def filter_console_log(record):
-    return record['name'] == 'console-log'
-
-
-def test_expected_action_types(conf, env):
-    r = requests.get(conf.get(env, 'api_root') + '/action')
+def test_expected_action_types(conf, requests_session):
+    r = requests_session.get(conf.getoption('server') + '/api/v1/action/')
     response = r.json()
 
     # Verify we have at least one response and then grab the first record
@@ -33,54 +16,21 @@ def test_expected_action_types(conf, env):
         assert record['name'] in expected_records
 
 
-def test_console_log(conf, env):
-    r = requests.get(conf.get(env, 'api_root') + '/action')
+def test_console_log(conf, requests_session):
+    r = requests_session.get(conf.getoption('server') + '/api/v1/action/')
     response = r.json()
 
     # Verify we have at least one response and then grab the first record
     assert len(response) >= 1
 
     # Look for any console-log actions
-    cl_records = list(filter(filter_console_log, response))
+    cl_records = [record for record in response if record['name'] == 'console-log']
 
     if len(cl_records) == 0:
         pytest.skip('No console-log actions found')
-    else:
-        console_log_test(cl_records[0])
+        return
 
-
-def test_show_heartbeat(conf, env):
-    r = requests.get(conf.get(env, 'api_root') + '/action')
-    response = r.json()
-
-    # Verify we have at least one response and then grab the first record
-    assert len(response) >= 1
-
-    # Let's find at least one record that is a 'show-heartbeat'
-    sh_records = list(filter(filter_show_heartbeat, response))
-
-    if len(sh_records) == 0:
-        pytest.skip('No show-heartbeat actions found')
-    else:
-        show_hearbeat_test(sh_records[0])
-
-
-def show_hearbeat_test(record):
-    expected_action_fields = [
-        'name',
-        'implementation_url',
-        'arguments_schema'
-    ]
-    for field in record:
-        assert field in expected_action_fields
-
-    # Do we have a valid schema for 'arguments_schema'?
-    r = requests.get(record['arguments_schema']['$schema'])
-    schema = r.json()
-    assert jsonschema.validate(record['arguments_schema'], schema) is None
-
-
-def console_log_test(record):
+    record = cl_records[0]
     # Does an 'action' have all the required fields?
     expected_action_fields = [
         'name',
@@ -91,6 +41,35 @@ def console_log_test(record):
         assert field in expected_action_fields
 
     # Do we have a valid schema for 'arguments_schema'?
-    r = requests.get(record['arguments_schema']['$schema'])
+    r = requests_session.get(record['arguments_schema']['$schema'])
+    schema = r.json()
+    assert jsonschema.validate(record['arguments_schema'], schema) is None
+
+
+def test_show_heartbeat(conf, requests_session):
+    r = requests_session.get(conf.getoption('server') + '/api/v1/action')
+    response = r.json()
+
+    # Verify we have at least one response and then grab the first record
+    assert len(response) >= 1
+
+    # Let's find at least one record that is a 'show-heartbeat'
+    sh_records = [record for record in response if record['name'] == 'show-heartbeat']
+
+    if len(sh_records) == 0:
+        pytest.skip('No show-heartbeat actions found')
+        return
+
+    record = sh_records[0]
+    expected_action_fields = [
+        'name',
+        'implementation_url',
+        'arguments_schema'
+    ]
+    for field in record:
+        assert field in expected_action_fields
+
+    # Do we have a valid schema for 'arguments_schema'?
+    r = requests_session.get(record['arguments_schema']['$schema'])
     schema = r.json()
     assert jsonschema.validate(record['arguments_schema'], schema) is None

From 7666fca9728099ea7f65afa56a7be9f32edf40ef Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 20 Jul 2016 16:07:52 -0700
Subject: [PATCH 45/74] Run contract-tests in CircleCI

Fixes bug 1251474
---
 bin/ci/contract-tests.sh             | 24 ++++++++++++++++++++++++
 bin/ci/{docker-run => docker-run.sh} | 17 ++++++++++++-----
 bin/ci/karma-ci.js                   |  3 ++-
 circle.yml                           | 13 ++++++++-----
 package.json                         |  3 ++-
 webpack.config.js                    | 12 +++++++-----
 6 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100755 bin/ci/contract-tests.sh
 rename bin/ci/{docker-run => docker-run.sh} (69%)

diff --git a/bin/ci/contract-tests.sh b/bin/ci/contract-tests.sh
new file mode 100755
index 00000000..d2cce11c
--- /dev/null
+++ b/bin/ci/contract-tests.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -u
+BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+echo $BASE_DIR
+cd $BASE_DIR
+
+echo "Setting up Normandy"
+createdb normandy
+./docker-run.sh -i -t ./manage.py migrate
+./docker-run.sh -i -t ./manage.py update_product_details
+./docker-run.sh -i -t ./manage.py initial_data
+./docker-run.sh -i -t ./manage.py update_actions
+echo "Starting Normandy server"
+SERVER_ID=$(./docker-run.sh -e DJANGO_CONFIGURATION=ProductionInsecure -d)
+
+docker run --net host -e CHECK_PORT=8000 -e CHECK_HOST=localhost giorgos/takis
+echo "Running acceptance tests"
+./docker-run.sh py.test contract-tests/ \
+  --server http://localhost:8000 \
+  --junitxml=/test_artifacts/pytest.xml
+STATUS=$?
+
+docker kill $SERVER_ID
+exit $STATUS
diff --git a/bin/ci/docker-run b/bin/ci/docker-run.sh
similarity index 69%
rename from bin/ci/docker-run
rename to bin/ci/docker-run.sh
index 1108c80f..c18d91c6 100755
--- a/bin/ci/docker-run
+++ b/bin/ci/docker-run.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
-set -eu
+
+set -x
 
 DOCKER_ARGS=( )
 
 if [[ -v CIRCLE_TEST_REPORTS ]]; then
-  DOCKER_ARGS+=(--volume $CIRCLE_TEST_REPORTS:/test/artifacts)
+  DOCKER_ARGS+=(--volume $CIRCLE_TEST_REPORTS:/test_artifacts)
 fi
 
 if [[ -f ~/cache/GeoLite2-Country.mmdb ]]; then
@@ -12,13 +13,19 @@ if [[ -f ~/cache/GeoLite2-Country.mmdb ]]; then
 fi
 
 # Parse out known command flags to give to `docker run` instead of the command
+# After hitting the first unrecognized argument, assume everything else it the
+# command to run
 while [ $# -ge 1 ]; do
   case $1 in
     --)
       shift
       break
       ;;
-    -p)
+    -d|-i|-t)
+      DOCKER_ARGS+=($1)
+      shift
+      ;;
+    -p|-e)
       DOCKER_ARGS+=($1 $2)
       shift
       shift
@@ -29,9 +36,9 @@ while [ $# -ge 1 ]; do
   esac
 done
 
-echo docker run \
-  --net host \
+docker run \
   --env DJANGO_CONFIGURATION=Test \
+  --net host \
   "${DOCKER_ARGS[@]}" \
   normandy:build \
   "$@"
diff --git a/bin/ci/karma-ci.js b/bin/ci/karma-ci.js
index 2ab10741..57d76085 100644
--- a/bin/ci/karma-ci.js
+++ b/bin/ci/karma-ci.js
@@ -1,7 +1,8 @@
+/* eslint-disable no-var, prefer-template */
 var karma = require('karma');
 var karmaConfig = require('karma/lib/config');
 
-var config = karmaConfig.parseConfig(__dirname + '/../karma.conf.js', {
+var config = karmaConfig.parseConfig(__dirname + '/../../karma.conf.js', {
   browsers: [],
   oneShot: true,
   reporters: ['spec', 'junit'],
diff --git a/circle.yml b/circle.yml
index 0f7969ed..6b17e6c2 100644
--- a/circle.yml
+++ b/circle.yml
@@ -23,11 +23,11 @@ test:
     - chmod -R 777 $CIRCLE_TEST_REPORTS
   override:
     # Run Python lint checks
-    - bin/ci/docker-run flake8 --output-file /test_artifacts/flake8.txt normandy
+    - bin/ci/docker-run.sh flake8 --output-file /test_artifacts/flake8.txt normandy
     # Run JS lint checks
-    - bin/ci/docker-run npm run lint -- --format junit --output-file /test_artifacts/eslint.xml
+    - bin/ci/docker-run.sh npm run lint -- --format junit --output-file /test_artifacts/eslint.xml
     # Run Python tests
-    - bin/ci/docker-run py.test --junitxml=/test_artifacts/pytest.xml normandy/
+    - bin/ci/docker-run.sh py.test --junitxml=/test_artifacts/pytest.xml normandy/
     # Start Karma test server, and run them in Firefox
     - >
       (
@@ -36,10 +36,13 @@ test:
         echo Starting Firefox;
         firefox localhost:9876
       ) &
-      bin/ci/docker-run -p 9876:9876 node bin/ci/karma-ci.js
+      bin/ci/docker-run.sh -p 9876:9876 node bin/ci/karma-ci.js
+    # Start the app, and run acceptance tests
+    - bin/ci/contract-tests.sh
+
   post:
     # Save test artifacts for Python and Lint tests
-    - bin/ci/docker-run flake8_junit /test_artifacts/flake8.txt /test_artifacts/flake8.xml
+    - bin/ci/docker-run.sh flake8_junit /test_artifacts/flake8.txt /test_artifacts/flake8.xml
     # Clean up old image and save the new one
     - >
       mkdir -p ~/cache/docker;
diff --git a/package.json b/package.json
index 1f27b69f..139448fa 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
   "scripts": {
     "watch": "webpack --config ./webpack.config.js --watch",
     "build": "webpack --config ./webpack.config.js",
-    "test": "karma start"
+    "test": "karma start",
+    "lint": "eslint normandy client webpack.config.js karam.conf.js"
   },
   "license": "MPL-2.0",
   "dependencies": {
diff --git a/webpack.config.js b/webpack.config.js
index e892ba8e..137f5468 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,9 +1,10 @@
+/* eslint-disable no-var, func-names, prefer-arrow-callback, prefer-template */
 var path = require('path');
 var webpack = require('webpack');
 var BundleTracker = require('webpack-bundle-tracker');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var argv = require('yargs').argv;
-var child_process = require('child_process');
+var childProcess = require('child_process');
 
 
 const BOLD = '\u001b[1m';
@@ -37,7 +38,7 @@ module.exports = [
       new BundleTracker({ filename: './webpack-stats.json' }),
       new ExtractTextPlugin('[name]-[hash].css'),
       new webpack.ProvidePlugin({
-        'fetch': 'exports?self.fetch!isomorphic-fetch',
+        fetch: 'exports?self.fetch!isomorphic-fetch',
       }),
     ],
 
@@ -74,12 +75,13 @@ module.exports = [
         // Small plugin to update the actions in the database if
         // --update-actions was passed.
       function updateActions() {
-        this.plugin('done', function (stats) {
+        var cmd;
+        this.plugin('done', function () {
           if (argv['update-actions']) {
               // Don't disable actions since this is mostly for development.
-            var cmd = 'python manage.py update_actions --no-disable';
+            cmd = 'python manage.py update_actions --no-disable';
 
-            child_process.exec(cmd, function (err, stdout, stderr) {
+            childProcess.exec(cmd, function (err, stdout, stderr) {
               console.log('\n' + BOLD + 'Updating Actions' + END_BOLD);
               console.log(stdout);
               if (stderr) {

From df988220dc4c4be785cf3607a34f6496a31ecdbe Mon Sep 17 00:00:00 2001
From: Mike Cooper <github@elem.us>
Date: Thu, 21 Jul 2016 15:03:17 -0700
Subject: [PATCH 46/74] Feedback

---
 contract-tests/conftest.py | 21 ++++-----------------
 manifest.ini               |  2 --
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 manifest.ini

diff --git a/contract-tests/conftest.py b/contract-tests/conftest.py
index 3f2e1197..570daee3 100644
--- a/contract-tests/conftest.py
+++ b/contract-tests/conftest.py
@@ -15,7 +15,7 @@ def pytest_addoption(parser):
         action="store_false",
         dest="verify",
         default=None,
-        help="Server to run tests against"
+        help="Don't verify SSL certs"
     )
 
 
@@ -24,21 +24,8 @@ def conf(request):
     return request.config
 
 
-class RequestVerifyWrapper(object):
-    """
-    `request.Session` doesn't have a way to permanently change the verify flag. This provides that.
-    """
-    def __init__(self, verify):
-        self.verify = verify
-        self.session = requests.Session()
-
-    def get(self, *args, **kwargs):
-        return self.session.get(*args, verify=self.verify, **kwargs)
-
-    # TODO: Add other HTTP methods as needed
-
-
 @pytest.fixture
 def requests_session(conf):
-    verify = conf.getoption('verify')
-    return RequestVerifyWrapper(verify)
+    session = requests.Session()
+    session.verify = conf.getoption('verify')
+    return session
diff --git a/manifest.ini b/manifest.ini
deleted file mode 100644
index 621fb13c..00000000
--- a/manifest.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dev]
-api_root = https://normandy.dev.mozaws.net/api/v1

From 6e80fc71dca9e02e25a0afd0202da72e5962d13d Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Fri, 22 Jul 2016 09:18:37 -0700
Subject: [PATCH 47/74] Fix typo in deploy script

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 6b17e6c2..31c2663b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -57,7 +57,7 @@ deployment:
     commands:
       # set DOCKER_DEPLOY=true in Circle UI to do deploys
       - "${DOCKER_DEPLOY:-false}"
-      - bin/ci/deply-dockerhub.sh latest
+      - bin/ci/deploy-dockerhub.sh latest
 
   tags:
     # push all tags
@@ -65,4 +65,4 @@ deployment:
     commands:
       # set DOCKER_DEPLOY=true in Circle UI to do deploys
       - "${DOCKER_DEPLOY:-false}"
-      - bin/ci/deply-dockerhub.sh "$CIRCLE_TAG"
+      - bin/ci/deploy-dockerhub.sh "$CIRCLE_TAG"

From 725cc5cf10d85f11683fb8aaf688a2aac7cb19a5 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Tue, 26 Jul 2016 17:04:56 -0700
Subject: [PATCH 48/74] Some simple frontend tests

---
 .../control/js/components/ActionForm.js       |  2 +-
 .../control/js/components/RecipeForm.js       |  4 +--
 .../components/action_forms/HeartbeatForm.js  |  6 ++--
 .../control/tests/components/ActionForm.js    | 30 ++++++++++++++++++
 .../control/tests/components/RecipeForm.js    | 31 +++++++++++++++++++
 .../components/action_forms/HeartbeatForm.js  | 18 +++++++++++
 6 files changed, 84 insertions(+), 7 deletions(-)
 create mode 100644 normandy/control/tests/components/ActionForm.js
 create mode 100644 normandy/control/tests/components/RecipeForm.js
 create mode 100644 normandy/control/tests/components/action_forms/HeartbeatForm.js

diff --git a/normandy/control/static/control/js/components/ActionForm.js b/normandy/control/static/control/js/components/ActionForm.js
index ee31b0bf..acf04094 100644
--- a/normandy/control/static/control/js/components/ActionForm.js
+++ b/normandy/control/static/control/js/components/ActionForm.js
@@ -35,7 +35,7 @@ export default reduxForm({
       break;
 
     default:
-      throw new Error(`Unexpected action name: "${name}"`);
+      throw new Error(`Unexpected action name: "${props.name}"`);
   }
 
   if (props.recipe && props.recipe.action === props.name) {
diff --git a/normandy/control/static/control/js/components/RecipeForm.js b/normandy/control/static/control/js/components/RecipeForm.js
index 9b08f130..35fc5dad 100644
--- a/normandy/control/static/control/js/components/RecipeForm.js
+++ b/normandy/control/static/control/js/components/RecipeForm.js
@@ -13,8 +13,9 @@ import FormField from './form_fields/FormFieldWrapper.js';
 import JexlEnvironment from '../../../../../selfrepair/static/js/JexlEnvironment.js';
 
 export class RecipeForm extends React.Component {
-  propTypes = {
+  static propTypes = {
     dispatch: pt.func.isRequired,
+    fields: pt.object.isRequired,
     formState: pt.object.isRequired,
     recipeId: pt.number.isRequired,
     submitting: pt.bool.isRequired,
@@ -143,7 +144,6 @@ export class RecipeForm extends React.Component {
   }
 }
 RecipeForm.propTypes = {
-  fields: React.PropTypes.object.isRequired,
 };
 
 export default composeRecipeContainer(reduxForm({
diff --git a/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js b/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js
index b03f992c..e4fd1ea6 100644
--- a/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js
+++ b/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js
@@ -92,8 +92,8 @@ SurveyForm.propTypes = {
   showDefaults: pt.func,
 };
 
-class HeartbeatForm extends React.Component {
-  propTypes = {
+export default class HeartbeatForm extends React.Component {
+  static propTypes = {
     fields: pt.object.isRequired,
   }
 
@@ -170,5 +170,3 @@ class HeartbeatForm extends React.Component {
     );
   }
 }
-
-export default HeartbeatForm;
diff --git a/normandy/control/tests/components/ActionForm.js b/normandy/control/tests/components/ActionForm.js
new file mode 100644
index 00000000..fa45a4d7
--- /dev/null
+++ b/normandy/control/tests/components/ActionForm.js
@@ -0,0 +1,30 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import { Provider } from 'react-redux';
+import controlStore from '../../static/control/js/stores/ControlStore.js';
+
+import ActionForm from '../../static/control/js/components/ActionForm.js';
+
+describe('<ActionForm>', () => {
+  let store;
+
+  beforeAll(() => {
+    store = controlStore();
+  });
+
+  it('should work', () => {
+    mount(<Provider store={store}><ActionForm name="console-log" /></Provider>);
+  });
+
+  it('raises an exception with unknown action names', () => {
+    expect(() => {
+      mount(<Provider store={store}><ActionForm name="does-not-exist" /></Provider>);
+    })
+    .toThrow(new Error('Unexpected action name: "does-not-exist"'));
+  });
+
+  it('should show the right action form', () => {
+    const wrapper = mount(<Provider store={store}><ActionForm name="console-log" /></Provider>);
+    expect(wrapper.contains('ConsoleLogForm'));
+  });
+});
diff --git a/normandy/control/tests/components/RecipeForm.js b/normandy/control/tests/components/RecipeForm.js
new file mode 100644
index 00000000..5db2bf9d
--- /dev/null
+++ b/normandy/control/tests/components/RecipeForm.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { shallow, mount } from 'enzyme';
+
+import ConnectedRecipeForm, { RecipeForm } from '../../static/control/js/components/RecipeForm.js';
+import controlStore from '../../static/control/js/stores/ControlStore.js';
+
+describe('<RecipeForm>', () => {
+  beforeAll(() => {
+  });
+
+  it('should work unconnected', () => {
+    shallow(<RecipeForm
+      dispatch={() => {}}
+      fields={{}}
+      formState={{}}
+      recipeId={0}
+      submitting={false}
+      recipe={{}}
+      handleSubmit={() => {}}
+      viewingRevision={false}
+    />);
+  });
+
+  it('should work connected', () => {
+    const store = controlStore();
+    mount(<Provider store={store}>
+      <ConnectedRecipeForm params={{}} location={{ query: '' }} />
+    </Provider>);
+  });
+});
diff --git a/normandy/control/tests/components/action_forms/HeartbeatForm.js b/normandy/control/tests/components/action_forms/HeartbeatForm.js
new file mode 100644
index 00000000..6bae2958
--- /dev/null
+++ b/normandy/control/tests/components/action_forms/HeartbeatForm.js
@@ -0,0 +1,18 @@
+import React from 'react';
+// import { Provider } from 'react-redux';
+import { shallow } from 'enzyme';
+// import configureMockStore from 'redux-mock-store';
+// import thunk from 'redux-thunk';
+
+import HeartbeatForm from '../../../static/control/js/components/action_forms/HeartbeatForm.js';
+
+// const mockStore = configureMockStore([thunk]);
+
+describe('<HeartbeatForm>', () => {
+  it('should work', () => {
+    const fields = {
+      surveys: {},
+    };
+    shallow(<HeartbeatForm fields={fields} />);
+  });
+});

From 09eac9e169188a888ea03cce5e79023fb845dabf Mon Sep 17 00:00:00 2001
From: Mike Cooper <github@elem.us>
Date: Wed, 27 Jul 2016 09:42:24 -0700
Subject: [PATCH 49/74] Remove commented code in HeartbeatForm test

---
 .../control/tests/components/action_forms/HeartbeatForm.js    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/normandy/control/tests/components/action_forms/HeartbeatForm.js b/normandy/control/tests/components/action_forms/HeartbeatForm.js
index 6bae2958..d672a6ff 100644
--- a/normandy/control/tests/components/action_forms/HeartbeatForm.js
+++ b/normandy/control/tests/components/action_forms/HeartbeatForm.js
@@ -1,12 +1,8 @@
 import React from 'react';
-// import { Provider } from 'react-redux';
 import { shallow } from 'enzyme';
-// import configureMockStore from 'redux-mock-store';
-// import thunk from 'redux-thunk';
 
 import HeartbeatForm from '../../../static/control/js/components/action_forms/HeartbeatForm.js';
 
-// const mockStore = configureMockStore([thunk]);
 
 describe('<HeartbeatForm>', () => {
   it('should work', () => {

From d85c0a8188facae58a7da08d3119535caa5fc0ae Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Wed, 27 Jul 2016 09:02:19 -0400
Subject: [PATCH 50/74] Specify exact dependency versions

---
 package.json | 58 ++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index 139448fa..4a9f84ac 100644
--- a/package.json
+++ b/package.json
@@ -14,35 +14,35 @@
   },
   "license": "MPL-2.0",
   "dependencies": {
-    "babel-polyfill": "^6.7.2",
-    "babel-preset-stage-0": "^6.5.0",
-    "babel-runtime": "^6.6.1",
-    "classnames": "^2.2.5",
-    "cssmin": "^0.4.3",
-    "font-awesome": "^4.5.0",
-    "isomorphic-fetch": "^2.2.1",
-    "jexl": "^1.1.3",
-    "jquery": "^2.2.3",
-    "json-editor": "^0.7.23",
-    "json-loader": "^0.5.4",
-    "moment": "^2.13.0",
-    "node-sass": "^3.4.2",
-    "node-uuid": "^1.4.7",
-    "react": "^15.0.2",
-    "react-addons-css-transition-group": "^15.1.0",
-    "react-breadcrumbs": "^1.3.15",
-    "react-dom": "^15.0.2",
-    "react-redux": "^4.4.5",
-    "react-router": "^2.4.0",
-    "react-router-redux": "^4.0.4",
-    "reactable": "^0.13.2",
-    "redux": "^3.5.2",
-    "redux-form": "^5.2.3",
-    "redux-thunk": "^2.0.1",
-    "sha.js": "^2.4.5",
-    "uglifyjs": "^2.4.10",
-    "underscore": "^1.8.3",
-    "wolfy87-eventemitter": "^4.3.0"
+    "babel-polyfill": "6.7.2",
+    "babel-preset-stage-0": "6.5.0",
+    "babel-runtime": "6.6.1",
+    "classnames": "2.2.5",
+    "cssmin": "0.4.3",
+    "font-awesome": "4.5.0",
+    "isomorphic-fetch": "2.2.1",
+    "jexl": "1.1.3",
+    "jquery": "2.2.3",
+    "json-editor": "0.7.23",
+    "json-loader": "0.5.4",
+    "moment": "2.13.0",
+    "node-sass": "3.4.2",
+    "node-uuid": "1.4.7",
+    "react": "15.0.2",
+    "react-addons-css-transition-group": "15.0.2",
+    "react-breadcrumbs": "1.3.15",
+    "react-dom": "15.0.2",
+    "react-redux": "4.4.5",
+    "react-router": "2.4.0",
+    "react-router-redux": "4.0.4",
+    "reactable": "0.13.2",
+    "redux": "3.5.2",
+    "redux-form": "5.2.3",
+    "redux-thunk": "2.0.1",
+    "sha.js": "2.4.5",
+    "uglifyjs": "2.4.10",
+    "underscore": "1.8.3",
+    "wolfy87-eventemitter": "4.3.0"
   },
   "devDependencies": {
     "babel": "^6.5.2",

From ec90ecd5fbd15efb0257b2dce20ca0c656db7568 Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Wed, 27 Jul 2016 12:44:30 -0400
Subject: [PATCH 51/74] Set dev dependency versions

---
 package.json | 76 ++++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index 4a9f84ac..a43726fe 100644
--- a/package.json
+++ b/package.json
@@ -45,45 +45,45 @@
     "wolfy87-eventemitter": "4.3.0"
   },
   "devDependencies": {
-    "babel": "^6.5.2",
-    "babel-core": "^6.7.7",
-    "babel-eslint": "^6.1.0",
-    "babel-loader": "^6.2.4",
-    "babel-plugin-transform-runtime": "^6.8.0",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-preset-react": "^6.5.0",
-    "css-loader": "^0.23.1",
-    "enzyme": "^2.3.0",
-    "eslint": "^2.13.1",
-    "eslint-config-airbnb": "^9.0.1",
-    "eslint-plugin-babel": "^3.3.0",
-    "eslint-plugin-import": "^1.10.0",
-    "eslint-plugin-jasmine": "^1.8.1",
-    "eslint-plugin-jsx-a11y": "^1.5.3",
-    "eslint-plugin-react": "^5.2.2",
-    "exports-loader": "^0.6.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "fetch-mock": "^4.5.4",
-    "file-loader": "^0.8.5",
-    "imports-loader": "^0.6.5",
-    "jasmine-core": "^2.4.1",
-    "jasmine-promises": "^0.4.1",
-    "karma": "^0.13.22",
-    "karma-firefox-launcher": "^1.0.0",
-    "karma-jasmine": "^1.0.2",
-    "karma-junit-reporter": "^1.0.0",
-    "karma-react-jsx-preprocessor": "^0.1.1",
-    "karma-sourcemap-loader": "^0.3.7",
+    "babel": "6.5.2",
+    "babel-core": "6.7.7",
+    "babel-eslint": "6.1.0",
+    "babel-loader": "6.2.4",
+    "babel-plugin-transform-runtime": "6.8.0",
+    "babel-preset-es2015": "6.6.0",
+    "babel-preset-react": "6.5.0",
+    "css-loader": "0.23.1",
+    "enzyme": "2.3.0",
+    "eslint": "2.13.1",
+    "eslint-config-airbnb": "9.0.1",
+    "eslint-plugin-babel": "3.3.0",
+    "eslint-plugin-import": "1.10.0",
+    "eslint-plugin-jasmine": "1.8.1",
+    "eslint-plugin-jsx-a11y": "1.5.3",
+    "eslint-plugin-react": "5.2.2",
+    "exports-loader": "0.6.3",
+    "extract-text-webpack-plugin": "1.0.1",
+    "fetch-mock": "4.5.4",
+    "file-loader": "0.8.5",
+    "imports-loader": "0.6.5",
+    "jasmine-core": "2.4.1",
+    "jasmine-promises": "0.4.1",
+    "karma": "0.13.22",
+    "karma-firefox-launcher": "1.0.0",
+    "karma-jasmine": "1.0.2",
+    "karma-junit-reporter": "1.0.0",
+    "karma-react-jsx-preprocessor": "0.1.1",
+    "karma-sourcemap-loader": "0.3.7",
     "karma-spec-reporter": "0.0.26",
-    "karma-webpack": "^1.7.0",
-    "postcss-loader": "^0.9.1",
-    "react-addons-test-utils": "^15.1.0",
-    "react-tools": "^0.13.3",
-    "redux-mock-store": "^1.0.2",
-    "sass-loader": "^3.2.0",
-    "style-loader": "^0.13.1",
-    "webpack": "^1.13.0",
+    "karma-webpack": "1.7.0",
+    "postcss-loader": "0.9.1",
+    "react-addons-test-utils": "15.1.0",
+    "react-tools": "0.13.3",
+    "redux-mock-store": "1.0.2",
+    "sass-loader": "3.2.0",
+    "style-loader": "0.13.1",
+    "webpack": "1.13.0",
     "webpack-bundle-tracker": "0.0.93",
-    "yargs": "^4.7.0"
+    "yargs": "4.7.0"
   }
 }

From 2cd0759e22f946aaab02cba0ccaf5dad96f9506d Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Thu, 28 Jul 2016 09:45:58 -0400
Subject: [PATCH 52/74] Resolve peer dependencies

---
 package.json | 58 ++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index a43726fe..8856216c 100644
--- a/package.json
+++ b/package.json
@@ -14,31 +14,31 @@
   },
   "license": "MPL-2.0",
   "dependencies": {
-    "babel-polyfill": "6.7.2",
+    "babel-polyfill": "6.9.1",
     "babel-preset-stage-0": "6.5.0",
-    "babel-runtime": "6.6.1",
+    "babel-runtime": "6.11.6",
     "classnames": "2.2.5",
     "cssmin": "0.4.3",
-    "font-awesome": "4.5.0",
+    "font-awesome": "4.6.3",
     "isomorphic-fetch": "2.2.1",
-    "jexl": "1.1.3",
-    "jquery": "2.2.3",
-    "json-editor": "0.7.23",
+    "jexl": "1.1.4",
+    "jquery": "2.2.4",
+    "json-editor": "0.7.27",
     "json-loader": "0.5.4",
-    "moment": "2.13.0",
-    "node-sass": "3.4.2",
+    "moment": "2.14.1",
+    "node-sass": "3.8.0",
     "node-uuid": "1.4.7",
-    "react": "15.0.2",
-    "react-addons-css-transition-group": "15.0.2",
-    "react-breadcrumbs": "1.3.15",
-    "react-dom": "15.0.2",
+    "react": "15.2.1",
+    "react-addons-css-transition-group": "15.2.1",
+    "react-breadcrumbs": "1.3.16",
+    "react-dom": "15.2.1",
     "react-redux": "4.4.5",
-    "react-router": "2.4.0",
-    "react-router-redux": "4.0.4",
+    "react-router": "2.6.0",
+    "react-router-redux": "4.0.5",
     "reactable": "0.13.2",
     "redux": "3.5.2",
     "redux-form": "5.2.3",
-    "redux-thunk": "2.0.1",
+    "redux-thunk": "2.1.0",
     "sha.js": "2.4.5",
     "uglifyjs": "2.4.10",
     "underscore": "1.8.3",
@@ -46,24 +46,24 @@
   },
   "devDependencies": {
     "babel": "6.5.2",
-    "babel-core": "6.7.7",
-    "babel-eslint": "6.1.0",
+    "babel-core": "6.11.4",
+    "babel-eslint": "6.1.2",
     "babel-loader": "6.2.4",
-    "babel-plugin-transform-runtime": "6.8.0",
-    "babel-preset-es2015": "6.6.0",
-    "babel-preset-react": "6.5.0",
+    "babel-plugin-transform-runtime": "6.12.0",
+    "babel-preset-es2015": "6.9.0",
+    "babel-preset-react": "6.11.1",
     "css-loader": "0.23.1",
-    "enzyme": "2.3.0",
+    "enzyme": "2.4.1",
     "eslint": "2.13.1",
     "eslint-config-airbnb": "9.0.1",
     "eslint-plugin-babel": "3.3.0",
-    "eslint-plugin-import": "1.10.0",
+    "eslint-plugin-import": "1.12.0",
     "eslint-plugin-jasmine": "1.8.1",
-    "eslint-plugin-jsx-a11y": "1.5.3",
+    "eslint-plugin-jsx-a11y": "1.5.5",
     "eslint-plugin-react": "5.2.2",
     "exports-loader": "0.6.3",
     "extract-text-webpack-plugin": "1.0.1",
-    "fetch-mock": "4.5.4",
+    "fetch-mock": "4.6.1",
     "file-loader": "0.8.5",
     "imports-loader": "0.6.5",
     "jasmine-core": "2.4.1",
@@ -71,19 +71,19 @@
     "karma": "0.13.22",
     "karma-firefox-launcher": "1.0.0",
     "karma-jasmine": "1.0.2",
-    "karma-junit-reporter": "1.0.0",
+    "karma-junit-reporter": "1.1.0",
     "karma-react-jsx-preprocessor": "0.1.1",
     "karma-sourcemap-loader": "0.3.7",
     "karma-spec-reporter": "0.0.26",
     "karma-webpack": "1.7.0",
     "postcss-loader": "0.9.1",
-    "react-addons-test-utils": "15.1.0",
+    "react-addons-test-utils": "15.2.1",
     "react-tools": "0.13.3",
     "redux-mock-store": "1.0.2",
-    "sass-loader": "3.2.0",
+    "sass-loader": "3.2.3",
     "style-loader": "0.13.1",
-    "webpack": "1.13.0",
+    "webpack": "1.13.1",
     "webpack-bundle-tracker": "0.0.93",
-    "yargs": "4.7.0"
+    "yargs": "4.8.1"
   }
 }

From a16ab04018a2a3a510288ef0ec167183255a4fa2 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Tue, 2 Aug 2016 09:57:35 -0700
Subject: [PATCH 53/74] Add therapist for linting

---
 .therapist.yml       |  8 ++++++++
 circle.yml           |  6 ++----
 docs/dev/install.rst | 20 +++++++++++++-------
 karma.conf.js        |  5 +++--
 requirements.txt     |  9 +++++++++
 5 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 .therapist.yml

diff --git a/.therapist.yml b/.therapist.yml
new file mode 100644
index 00000000..5e8a26cb
--- /dev/null
+++ b/.therapist.yml
@@ -0,0 +1,8 @@
+actions:
+  flake8:
+    run: flake8 {files}
+    include: "*.py"
+    exclude: "docs/"
+  eslint:
+    run: ./node_modules/.bin/eslint {files}
+    include: "*.js"
diff --git a/circle.yml b/circle.yml
index 31c2663b..1c47049e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -22,10 +22,8 @@ test:
   pre:
     - chmod -R 777 $CIRCLE_TEST_REPORTS
   override:
-    # Run Python lint checks
-    - bin/ci/docker-run.sh flake8 --output-file /test_artifacts/flake8.txt normandy
-    # Run JS lint checks
-    - bin/ci/docker-run.sh npm run lint -- --format junit --output-file /test_artifacts/eslint.xml
+    # Run lint checks
+    - therapist run --use-tracked-files
     # Run Python tests
     - bin/ci/docker-run.sh py.test --junitxml=/test_artifacts/pytest.xml normandy/
     # Start Karma test server, and run them in Firefox
diff --git a/docs/dev/install.rst b/docs/dev/install.rst
index 5aab8777..5cfee707 100644
--- a/docs/dev/install.rst
+++ b/docs/dev/install.rst
@@ -57,14 +57,20 @@ Installation
       :ref:`pip-install-error`
          How to troubleshoot errors during ``pip install``.
 
-4. Install frontend dependencies and build the frontend code using npm:
+4. Install pre-commit tools (optional)
+
+   .. code-block:: bash
+
+      therapist install
+
+5. Install frontend dependencies and build the frontend code using npm:
 
    .. code-block:: bash
 
       npm install
       npm run build
 
-5. Create a Postgres database for Normandy. By default it is assumed to be named
+6. Create a Postgres database for Normandy. By default it is assumed to be named
    ``normandy``:
 
    .. code-block:: bash
@@ -82,33 +88,33 @@ Installation
          DATABASE_URL=postgres://username:password@server_addr/database_name
 
 
-6. Initialize your database by running the migrations:
+7. Initialize your database by running the migrations:
 
    .. code-block:: bash
 
       python manage.py migrate
 
-7. Create a new superuser account:
+8. Create a new superuser account:
 
    .. code-block:: bash
 
       python manage.py createsuperuser
 
-8. Pull the latest data on Firefox releases and supported locales with the
+9. Pull the latest data on Firefox releases and supported locales with the
    ``update_product_details`` command:
 
    .. code-block:: bash
 
       python manage.py update_product_details
 
-9. Pull the latest geolocation database using the ``download_geolite2.sh``
+10. Pull the latest geolocation database using the ``download_geolite2.sh``
    script:
 
    .. code-block:: bash
 
       ./bin/download_geolite2.sh
 
-10. Add some useful initial data to your database using the ``initial_data``
+11. Add some useful initial data to your database using the ``initial_data``
     command:
 
     .. code-block:: bash
diff --git a/karma.conf.js b/karma.conf.js
index 7f9bf8bb..332b7603 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,3 +1,4 @@
+/* eslint-disable func-names, no-var */
 // Karma configuration
 module.exports = function (config) {
   var karmaConfig = {
@@ -58,8 +59,8 @@ module.exports = function (config) {
     // enable / disable colors in the output (reporters and logs)
     colors: true,
 
-    // level of logging
-    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    // possible values: config.LOG_DISABLE, config.LOG_ERROR, config.LOG_WARN,
+    // config.LOG_INFO, or config.LOG_DEBUG.
     logLevel: config.LOG_INFO,
 
     // enable / disable watching file and executing tests whenever any file changes
diff --git a/requirements.txt b/requirements.txt
index ee1582b4..bb7d83fe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -172,3 +172,12 @@ flake8-junit-report==2.0.1 \
     --hash=sha256:55914a99126d3b30cad2a042d95d466b5b368c7f69ef68ec7ec8321d3f0e2eee
 configparser==3.5.0 \
     --hash=sha256:5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a
+therapist==0.3 \
+    --hash=sha256:33e4d7ba75f69a73fbf0772208cc6ee4aeabfbcddf9f5ebda83a72e767c942ef
+pathspec==0.4.0 \
+    --hash=sha256:d3147deb81d4d540f7489f9e761f6d2ab001351752a75ec45741adacc7880e1c
+click==6.6 \
+    --hash=sha256:cc6a19da8ebff6e7074f731447ef7e112bd23adf3de5c597cf9989f2fd8defe9
+PyYAML==3.11 \
+    --hash=sha256:c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 \
+    --hash=sha256:19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9

From e28ebcd7b8f3aded2bffdbe2c97885d288a55942 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Tue, 2 Aug 2016 10:32:17 -0700
Subject: [PATCH 54/74] Run therapist in docker

---
 Dockerfile | 3 +--
 circle.yml | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8ab52af0..e86e45ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,8 +23,7 @@ RUN ./node_modules/.bin/webpack && \
     mkdir -p __version__ && \
     mkdir -p /test_artifacts && \
     chmod 777 /test_artifacts && \
-    git rev-parse HEAD > __version__/commit && \
-    rm -rf .git
+    git rev-parse HEAD > __version__/commit
 
 USER app
 ENV DJANGO_SETTINGS_MODULE=normandy.settings \
diff --git a/circle.yml b/circle.yml
index 1c47049e..1f7aa83a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -23,7 +23,7 @@ test:
     - chmod -R 777 $CIRCLE_TEST_REPORTS
   override:
     # Run lint checks
-    - therapist run --use-tracked-files
+    - bin/ci/docker-run.sh therapist run --use-tracked-files
     # Run Python tests
     - bin/ci/docker-run.sh py.test --junitxml=/test_artifacts/pytest.xml normandy/
     # Start Karma test server, and run them in Firefox
@@ -39,8 +39,6 @@ test:
     - bin/ci/contract-tests.sh
 
   post:
-    # Save test artifacts for Python and Lint tests
-    - bin/ci/docker-run.sh flake8_junit /test_artifacts/flake8.txt /test_artifacts/flake8.xml
     # Clean up old image and save the new one
     - >
       mkdir -p ~/cache/docker;

From e91e59a3b0b1cb875d7554eb86c0c8d72e0f9077 Mon Sep 17 00:00:00 2001
From: Rehan Dalal <rehandalal@gmail.com>
Date: Tue, 2 Aug 2016 16:38:36 -0400
Subject: [PATCH 55/74] Upgrade therapist 0.3.1

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index bb7d83fe..e20e0968 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -172,8 +172,8 @@ flake8-junit-report==2.0.1 \
     --hash=sha256:55914a99126d3b30cad2a042d95d466b5b368c7f69ef68ec7ec8321d3f0e2eee
 configparser==3.5.0 \
     --hash=sha256:5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a
-therapist==0.3 \
-    --hash=sha256:33e4d7ba75f69a73fbf0772208cc6ee4aeabfbcddf9f5ebda83a72e767c942ef
+therapist==0.3.1 \
+    --hash=sha256:b14b91f24edfd7678b591449511a62c5db13682129f8cf89f121255ff04d00ae
 pathspec==0.4.0 \
     --hash=sha256:d3147deb81d4d540f7489f9e761f6d2ab001351752a75ec45741adacc7880e1c
 click==6.6 \

From 6202faee8d6426397bd09ec3fd531a3e0d7062e0 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 3 Aug 2016 11:02:52 -0700
Subject: [PATCH 56/74] Add test to verify that classify_client makes no DB
 requests

---
 normandy/recipes/tests/test_api.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/normandy/recipes/tests/test_api.py b/normandy/recipes/tests/test_api.py
index ad679699..ecf8e1a8 100644
--- a/normandy/recipes/tests/test_api.py
+++ b/normandy/recipes/tests/test_api.py
@@ -2,7 +2,8 @@ import hashlib
 from unittest.mock import patch
 
 from django.contrib.contenttypes.models import ContentType
-from django.db import transaction
+from django.db import connection, transaction
+from django.test.utils import CaptureQueriesContext
 
 import pytest
 from rest_framework.reverse import reverse
@@ -532,3 +533,10 @@ class TestClassifyClient(object):
             'country': 'us',
             'request_time': '2016-01-01T00:00:00Z',
         }
+
+    def test_makes_no_db_queries(self, client):
+        queries = CaptureQueriesContext(connection)
+        with queries:
+            res = client.get('/api/v1/classify_client/')
+            assert res.status_code == 200
+        assert len(queries) == 0

From 0b881f446f37b8a2600184fb10360581ed37fdd5 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 3 Aug 2016 11:16:57 -0700
Subject: [PATCH 57/74] Remove massive spacing in uitour

---
 normandy/selfrepair/static/js/uitour.js | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/normandy/selfrepair/static/js/uitour.js b/normandy/selfrepair/static/js/uitour.js
index 91ee9836..7f717fea 100644
--- a/normandy/selfrepair/static/js/uitour.js
+++ b/normandy/selfrepair/static/js/uitour.js
@@ -29,8 +29,8 @@ if (typeof Mozilla == 'undefined') {
     var event = new CustomEvent('mozUITour', {
       bubbles: true,
       detail: {
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        action,
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                data: data || {},
+	      action,
+	      data: data || {},
       },
     });
 
@@ -46,9 +46,9 @@ if (typeof Mozilla == 'undefined') {
 
     function listener(event) {
       if (typeof event.detail != 'object')
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                return;
+	      return;
       if (event.detail.callbackID != id)
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                return;
+	      return;
 
       document.removeEventListener('mozUITourResponse', listener);
       callback(event.detail.data);
@@ -113,10 +113,10 @@ if (typeof Mozilla == 'undefined') {
 
     if (options) {
       for (var option in options) {
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                if (!options.hasOwnProperty(option)) {
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      continue;
-	}
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                args[option] = options[option];
+	      if (!options.hasOwnProperty(option)) {
+	        continue;
+	      }
+	      args[option] = options[option];
       }
     }
 
@@ -138,12 +138,12 @@ if (typeof Mozilla == 'undefined') {
     var buttonData = [];
     if (Array.isArray(buttons)) {
       for (var i = 0; i < buttons.length; i++) {
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                buttonData.push({
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      label: buttons[i].label,
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      icon: buttons[i].icon,
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      style: buttons[i].style,
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      callbackID: _waitForCallback(buttons[i].callback),
-	});
+	      buttonData.push({
+	        label: buttons[i].label,
+	        icon: buttons[i].icon,
+	        style: buttons[i].style,
+	        callbackID: _waitForCallback(buttons[i].callback),
+	      });
       }
     }
 
@@ -194,8 +194,8 @@ if (typeof Mozilla == 'undefined') {
       themes.push(theme);
 
       _sendEvent('previewTheme', {
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                theme: JSON.stringify(theme),
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                state: true,
+	      theme: JSON.stringify(theme),
+	      state: true,
       });
 
       callback(theme);

From c215031c4805ce0b584016908248302b5507c772 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 3 Aug 2016 15:25:22 -0700
Subject: [PATCH 58/74] Test that the API does not set cookies

---
 normandy/recipes/tests/test_api.py | 38 +++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/normandy/recipes/tests/test_api.py b/normandy/recipes/tests/test_api.py
index ecf8e1a8..16b0812c 100644
--- a/normandy/recipes/tests/test_api.py
+++ b/normandy/recipes/tests/test_api.py
@@ -68,12 +68,23 @@ class TestActionAPI(object):
 
     def test_detail_view_includes_cache_headers(self, api_client):
         action = ActionFactory()
-        res = api_client.get('/api/v1/action/{name}/'.format(name=action))
+        res = api_client.get('/api/v1/action/{name}/'.format(name=action.name))
         assert res.status_code == 200
         # It isn't important to assert a particular value for max-age
         assert 'max-age=' in res['Cache-Control']
         assert 'public' in res['Cache-Control']
 
+    def test_list_sets_no_cookies(self, api_client):
+        res = api_client.get('/api/v1/action/')
+        assert res.status_code == 200
+        assert 'Cookies' not in res
+
+    def test_detail_sets_no_cookies(self, api_client):
+        action = ActionFactory()
+        res = api_client.get('/api/v1/action/{name}/'.format(name=action.name))
+        assert res.status_code == 200
+        assert res.client.cookies == {}
+
 
 @pytest.mark.django_db
 class TestImplementationAPI(object):
@@ -113,6 +124,15 @@ class TestImplementationAPI(object):
         assert max_age in res['Cache-Control']
         assert 'public' in res['Cache-Control']
 
+    def test_sets_no_cookies(self, api_client):
+        action = ActionFactory()
+        res = api_client.get('/api/v1/action/{name}/implementation/{hash}/'.format(
+            name=action.name,
+            hash=action.implementation_hash,
+        ))
+        assert res.status_code == 200
+        assert res.client.cookies == {}
+
 
 @pytest.mark.django_db
 class TestRecipeAPI(object):
@@ -295,6 +315,17 @@ class TestRecipeAPI(object):
         assert 'max-age=' in res['Cache-Control']
         assert 'public' in res['Cache-Control']
 
+    def test_list_sets_no_cookies(self, api_client):
+        res = api_client.get('/api/v1/recipe/')
+        assert res.status_code == 200
+        assert 'Cookies' not in res
+
+    def test_detail_sets_no_cookies(self, api_client):
+        recipe = RecipeFactory()
+        res = api_client.get('/api/v1/recipe/{id}/'.format(id=recipe.id))
+        assert res.status_code == 200
+        assert res.client.cookies == {}
+
 
 @pytest.mark.django_db
 class TestRecipeVersionAPI(object):
@@ -540,3 +571,8 @@ class TestClassifyClient(object):
             res = client.get('/api/v1/classify_client/')
             assert res.status_code == 200
         assert len(queries) == 0
+
+    def test_sets_no_cookies(self, api_client):
+        res = api_client.get('/api/v1/classify_client/')
+        assert res.status_code == 200
+        assert res.client.cookies == {}

From d6bb78235b8cec2ec65a4fb67641746565f77c20 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 3 Aug 2016 15:28:13 -0700
Subject: [PATCH 59/74] Test that self-repair endpoint does not set cookies

---
 normandy/selfrepair/tests/test_views.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/normandy/selfrepair/tests/test_views.py b/normandy/selfrepair/tests/test_views.py
index e1b65832..f26ddffb 100644
--- a/normandy/selfrepair/tests/test_views.py
+++ b/normandy/selfrepair/tests/test_views.py
@@ -25,3 +25,8 @@ class TestSelfRepair:
         assert client.get(url).status_code == 200
         url += '/'
         assert client.get(url).status_code == 200
+
+    def test_sets_no_cookies(self, client):
+        res = client.get('/en-US/repair')
+        assert res.status_code == 200
+        assert res.client.cookies == {}

From 9f4f4c2f60d745942d18cf75e00bbae7e7b4cd7d Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Thu, 4 Aug 2016 11:27:25 -0700
Subject: [PATCH 60/74] Add ProductionReadOnly environment to settings.

This environment will be used on public webheads that shouldn't
make changes to the database. Mainly we want to disable things that
modify cookies (like SessionMiddleware) on these nodes.
---
 normandy/base/middleware.py | 19 -------------------
 normandy/settings.py        | 34 +++++++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/normandy/base/middleware.py b/normandy/base/middleware.py
index fd50c831..289fb261 100644
--- a/normandy/base/middleware.py
+++ b/normandy/base/middleware.py
@@ -1,25 +1,6 @@
-from django.core.urlresolvers import Resolver404, resolve
 from django.utils import timezone
 
 
-class ShortCircuitMiddleware(object):
-    """
-    Middleware that skips remaining middleware when a view is marked with
-    normandy.base.decorators.short_circuit_middlewares
-    """
-
-    def process_request(self, request):
-        try:
-            result = resolve(request.path)
-        except Resolver404:
-            return
-
-        if getattr(result.func, 'short_circuit_middlewares', False):
-            return result.func(request, *result.args, **result.kwargs)
-        else:
-            return None
-
-
 class RequestReceivedAtMiddleware(object):
     """
     Adds a 'received_at' property to requests with a datetime showing
diff --git a/normandy/settings.py b/normandy/settings.py
index 6cf55606..45bbcb26 100644
--- a/normandy/settings.py
+++ b/normandy/settings.py
@@ -31,17 +31,12 @@ class Core(Configuration):
         'django.contrib.staticfiles',
     ]
 
+    # Middleware that ALL environments must have. See the Base class for
+    # details.
     MIDDLEWARE_CLASSES = [
         'normandy.base.middleware.RequestReceivedAtMiddleware',
         'django.middleware.security.SecurityMiddleware',
-        'normandy.base.middleware.ShortCircuitMiddleware',
-
-        'django.contrib.sessions.middleware.SessionMiddleware',
         'django.middleware.common.CommonMiddleware',
-        'django.middleware.csrf.CsrfViewMiddleware',
-        'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-        'django.contrib.messages.middleware.MessageMiddleware',
         'django.middleware.clickjacking.XFrameOptionsMiddleware',
     ]
 
@@ -136,6 +131,23 @@ class Base(Core):
     DEBUG = values.BooleanValue(False)
     ADMINS = values.SingleNestedListValue([])
 
+    # Middleware that _most_ environments will need. Subclasses can
+    # override this list.
+    EXTRA_MIDDLEWARE_CLASSES = [
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+    ]
+
+    def MIDDLEWARE_CLASSES(self):
+        """
+        Determine middleware by combining the core set and
+        per-environment set.
+        """
+        return Core.MIDDLEWARE_CLASSES + self.EXTRA_MIDDLEWARE_CLASSES
+
     # Remote services
     DATABASES = values.DatabaseURLValue('postgres://postgres@localhost/normandy')
     GEOIP2_DATABASE = values.Value(os.path.join(Core.BASE_DIR, 'GeoLite2-Country.mmdb'))
@@ -230,6 +242,14 @@ class Production(Base):
     SECURE_PROXY_SSL_HEADER = values.TupleValue(('HTTP_X_FORWARDED_PROTO', 'https'))
 
 
+class ProductionReadOnly(Production):
+    """
+    Settings for a production environment that is read-only. This is
+    used on public-facing webheads.
+    """
+    EXTRA_MIDDLEWARE_CLASSES = []  # No need for sessions!
+
+
 class ProductionInsecure(Production):
     """
     Settings for a production-like environment that lacks many security features.

From d986ef1db6768e5fba080d6103240c95a852f3e0 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Thu, 4 Aug 2016 12:23:45 -0700
Subject: [PATCH 61/74] Disable admin by default in ProductionReadOnly

---
 normandy/settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/normandy/settings.py b/normandy/settings.py
index 45bbcb26..0b4ad215 100644
--- a/normandy/settings.py
+++ b/normandy/settings.py
@@ -248,6 +248,7 @@ class ProductionReadOnly(Production):
     used on public-facing webheads.
     """
     EXTRA_MIDDLEWARE_CLASSES = []  # No need for sessions!
+    ADMIN_ENABLED = values.BooleanValue(False)
 
 
 class ProductionInsecure(Production):

From 14ecb5c99d828a7836493e4b42d586f5eba08c9b Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Thu, 4 Aug 2016 15:18:50 -0700
Subject: [PATCH 62/74] Silence CSRF warning in ProductionReadOnly

---
 normandy/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/normandy/settings.py b/normandy/settings.py
index 0b4ad215..ac93e690 100644
--- a/normandy/settings.py
+++ b/normandy/settings.py
@@ -130,6 +130,7 @@ class Base(Core):
     # General settings
     DEBUG = values.BooleanValue(False)
     ADMINS = values.SingleNestedListValue([])
+    SILENCED_SYSTEM_CHECKS = values.ListValue([])
 
     # Middleware that _most_ environments will need. Subclasses can
     # override this list.
@@ -249,6 +250,7 @@ class ProductionReadOnly(Production):
     """
     EXTRA_MIDDLEWARE_CLASSES = []  # No need for sessions!
     ADMIN_ENABLED = values.BooleanValue(False)
+    SILENCED_SYSTEM_CHECKS = values.ListValue(['security.W003'])  # CSRF check
 
 
 class ProductionInsecure(Production):

From 85f9cf0970917d5474a02374b86e0b57d92bf9f2 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Thu, 4 Aug 2016 15:53:05 -0700
Subject: [PATCH 63/74] Update __heartbeat__ to honor SILENCED_SYSTEM_CHECKS

---
 normandy/health/api/views.py | 6 +++---
 normandy/settings.py         | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/normandy/health/api/views.py b/normandy/health/api/views.py
index b8d12f5f..bbb5bda7 100644
--- a/normandy/health/api/views.py
+++ b/normandy/health/api/views.py
@@ -94,11 +94,11 @@ def heartbeat_level_to_text(level):
 
 def heartbeat_check_detail(check):
     errors = check(app_configs=None)
-    level = 0
-    level = max([level] + [e.level for e in errors])
+    errors = list(filter(lambda e: e.id not in settings.SILENCED_SYSTEM_CHECKS, errors))
+    level = max([0] + [e.level for e in errors])
 
     return {
         'status': heartbeat_level_to_text(level),
         'level': level,
-        'messages': [e.msg for e in errors],
+        'messages': {e.id: e.msg for e in errors},
     }
diff --git a/normandy/settings.py b/normandy/settings.py
index ac93e690..bf218591 100644
--- a/normandy/settings.py
+++ b/normandy/settings.py
@@ -267,6 +267,10 @@ class ProductionInsecure(Production):
     CSRF_COOKIE_SECURE = values.BooleanValue(False)
     SECURE_HSTS_SECONDS = values.IntegerValue(0)
     SESSION_COOKIE_SECURE = values.BooleanValue(False)
+    SILENCED_SYSTEM_CHECKS = values.ListValue([
+        'security.W008',  # Secure SSL redirect
+        'security.W009',  # Secret key length
+    ])
 
 
 class Build(Production):

From d74b1d9c442a5f7174348dff917067f89e9caff8 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Mon, 8 Aug 2016 16:24:15 -0700
Subject: [PATCH 64/74] Only get enabled recipes from the server

---
 normandy/selfrepair/static/js/self_repair_runner.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/normandy/selfrepair/static/js/self_repair_runner.js b/normandy/selfrepair/static/js/self_repair_runner.js
index 728b783e..682d1db0 100644
--- a/normandy/selfrepair/static/js/self_repair_runner.js
+++ b/normandy/selfrepair/static/js/self_repair_runner.js
@@ -62,9 +62,8 @@ export function getUserId() {
 export function fetchRecipes() {
   const { recipeUrl } = document.documentElement.dataset;
   const headers = { Accept: 'application/json' };
-  const data = { enabled: 'True' };
 
-  return fetch(recipeUrl, { headers, data })
+  return fetch(`${recipeUrl}?enabled=true`, { headers })
   .then(response => response.json());
 }
 

From c6760a55054e7f7befaefaf2fe0e53fbe6407f59 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Tue, 9 Aug 2016 17:56:31 -0700
Subject: [PATCH 65/74] Set a comment on reversions created by update_actions.

---
 .../recipes/management/commands/update_actions.py  |  1 +
 normandy/recipes/tests/test_commands.py            | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/normandy/recipes/management/commands/update_actions.py b/normandy/recipes/management/commands/update_actions.py
index 98bed588..fc1a3a2d 100644
--- a/normandy/recipes/management/commands/update_actions.py
+++ b/normandy/recipes/management/commands/update_actions.py
@@ -33,6 +33,7 @@ class Command(BaseCommand):
     @reversion.create_revision()
     def handle(self, *args, **options):
         disabled_recipes = []
+        reversion.set_comment('Updating actions.')
 
         action_names = settings.ACTIONS.keys()
         if options['action_name']:
diff --git a/normandy/recipes/tests/test_commands.py b/normandy/recipes/tests/test_commands.py
index 4fbd5624..3464c1b3 100644
--- a/normandy/recipes/tests/test_commands.py
+++ b/normandy/recipes/tests/test_commands.py
@@ -3,6 +3,7 @@ from unittest.mock import patch
 from django.core.management import call_command
 
 import pytest
+from reversion.models import Version
 
 from normandy.recipes.models import Action
 from normandy.recipes.tests import ActionFactory, RecipeFactory
@@ -126,3 +127,16 @@ class TestUpdateActions(object):
         call_command('update_actions', '--no-disable')
         recipe.refresh_from_db()
         assert recipe.enabled
+
+    def test_it_sets_the_revision_comment(self, mock_action):
+        mock_action('test-action', 'console.log("foo");', {'type': 'int'})
+
+        call_command('update_actions')
+        assert Action.objects.count() == 1
+
+        action = Action.objects.all()[0]
+        versions = Version.objects.get_for_object(action)
+        assert versions.count() == 1
+
+        version = versions[0]
+        assert version.revision.comment == 'Updating actions.'

From 3e40d18b15d9ab9e5a52354bbe8322949eed25e5 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Tue, 9 Aug 2016 17:58:30 -0700
Subject: [PATCH 66/74] Use Version.objects.get_for_model for succinctness.

---
 normandy/recipes/api/views.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/normandy/recipes/api/views.py b/normandy/recipes/api/views.py
index ab31ec2b..bb0b6667 100644
--- a/normandy/recipes/api/views.py
+++ b/normandy/recipes/api/views.py
@@ -198,8 +198,7 @@ class RecipeVersionViewSet(viewsets.ReadOnlyModelViewSet):
     ]
 
     def get_queryset(self):
-        content_type = ContentType.objects.get_for_model(Recipe)
-        return Version.objects.filter(content_type=content_type)
+        return Version.objects.get_for_model(Recipe)
 
 
 class ClassifyClient(views.APIView):

From 692e1ef88004b25b4f59548d4376a8cd7fdab56d Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Wed, 10 Aug 2016 12:52:11 -0400
Subject: [PATCH 67/74] Fix indentation

---
 normandy/selfrepair/static/js/utils.js  | 13 +++++++------
 normandy/selfrepair/tests/test_utils.js | 16 ++++++++--------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/normandy/selfrepair/static/js/utils.js b/normandy/selfrepair/static/js/utils.js
index dbdc6ad1..cd975a68 100644
--- a/normandy/selfrepair/static/js/utils.js
+++ b/normandy/selfrepair/static/js/utils.js
@@ -7,8 +7,8 @@ import Sha256 from 'sha.js/sha256';
  *   characters.
  */
 export function fractionToKey(frac) {
-    // SHA 256 hashes are 64-digit hexadecimal numbers. The largest possible SHA
-    // 256 hash is 2^256 - 1.
+  // SHA 256 hashes are 64-digit hexadecimal numbers. The largest possible SHA
+  // 256 hash is 2^256 - 1.
 
   if (frac < 0 || frac > 1) {
     throw new Error(`frac must be between 0 and 1 inclusive (got ${frac})`);
@@ -17,14 +17,15 @@ export function fractionToKey(frac) {
   const mult = 2 ** 256 - 1;
   const inDecimal = Math.floor(frac * mult);
   let hexDigits = inDecimal.toString(16);
+
+  // Left pad with zeroes
+  // If N zeroes are needed, generate an array of nulls N+1 elements long,
+  // and inserts zeroes between each null.
   if (hexDigits.length < 64) {
-        // Left pad with zeroes
-        // If N zeroes are needed, generate an array of nulls N+1 elements long,
-        // and inserts zeroes between each null.
     hexDigits = Array(64 - hexDigits.length + 1).join('0') + hexDigits;
   }
 
-    // Saturate at 2**256 - 1
+  // Saturate at 2**256 - 1
   if (hexDigits.length > 64) {
     hexDigits = Array(65).join('f');
   }
diff --git a/normandy/selfrepair/tests/test_utils.js b/normandy/selfrepair/tests/test_utils.js
index 6b393808..208024a9 100644
--- a/normandy/selfrepair/tests/test_utils.js
+++ b/normandy/selfrepair/tests/test_utils.js
@@ -10,26 +10,26 @@ function repeatString(char, times) {
 
 describe('fractionToKey', () => {
   it('should match some known values', () => {
-        // quick range check
+    // quick range check
     expect(fractionToKey(0 / 4)).toEqual(repeatString('0', 64));
     expect(fractionToKey(1 / 4)).toEqual(`4${repeatString('0', 63)}`);
     expect(fractionToKey(2 / 4)).toEqual(`8${repeatString('0', 63)}`);
     expect(fractionToKey(3 / 4)).toEqual(`c${repeatString('0', 63)}`);
     expect(fractionToKey(4 / 4)).toEqual(repeatString('f', 64));
 
-        // Tests leading zeroes
+    // Tests leading zeroes
     expect(fractionToKey(1 / 32)).toEqual(`08${repeatString('0', 62)}`);
 
-        // The expected output here is 0.00001 * 2^256, in hex.
+    // The expected output here is 0.00001 * 2^256, in hex.
     expect(fractionToKey(0.00001))
-        .toEqual('0000a7c5ac471b47880000000000000000000000000000000000000000000000');
+      .toEqual('0000a7c5ac471b47880000000000000000000000000000000000000000000000');
   });
 
   it('handles error cases', () => {
     const cases = [-1, -0.5, 1.5, 2];
     for (const val of cases) {
       expect(() => fractionToKey(val))
-            .toThrowError(`frac must be between 0 and 1 inclusive (got ${val})`);
+        .toThrowError(`frac must be between 0 and 1 inclusive (got ${val})`);
     }
   });
 
@@ -44,7 +44,7 @@ describe('fractionToKey', () => {
 
 describe('stableSample', () => {
   it('should match at about the right rate', () => {
-        // This test could in theory fail randomly, but I think the probability is pretty good.
+    // This test could in theory fail randomly, but I think the probability is pretty good.
     const trials = 1000;
     const rate = Math.random();
     let hits = 0;
@@ -53,12 +53,12 @@ describe('stableSample', () => {
         hits += 1;
       }
     }
-        // 95% accurate
+    // 95% accurate
     expect(Math.abs((hits / trials) - rate) < 0.05).toEqual(true);
   });
 
   it('should be stable', () => {
-        // Make sure that the stable sample returns the same value repeatedly.
+    // Make sure that the stable sample returns the same value repeatedly.
     for (let i = 0; i < 100; i++) {
       const rate = Math.random();
       const val = Math.random();

From d44c0f71e0e3db60a804e6f18307c97502bdb571 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Thu, 11 Aug 2016 22:57:57 +0000
Subject: [PATCH 68/74] Add CI badge to README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4a75f938..aa263559 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Normandy
+# Normandy [![CircleCI](https://img.shields.io/circleci/project/mozilla/normandy.svg)](https://circleci.com/gh/mozilla/normandy/tree/master)
 
 Normandy is the server-side implementation of the [Recipe Server][]. It serves
 bundles of JavaScript to various clients (Firefox browsers) based on certain

From 35b0652e8bc69f1ec1bc751f53d9a25a96b5e4fa Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@mozilla.com>
Date: Tue, 9 Aug 2016 21:38:00 -0700
Subject: [PATCH 69/74] Add comment field to history page.

Also split the top-level history component into a container
for managing state and a presentational component.
---
 .../static/control/admin/sass/control.scss    | 37 ++++-----
 .../control/js/components/RecipeHistory.js    | 81 ++++++++++++-------
 .../control/tests/components/RecipeHistory.js | 58 +++++++++++++
 normandy/recipes/api/serializers.py           |  2 +
 4 files changed, 124 insertions(+), 54 deletions(-)
 create mode 100644 normandy/control/tests/components/RecipeHistory.js

diff --git a/normandy/control/static/control/admin/sass/control.scss b/normandy/control/static/control/admin/sass/control.scss
index 03d356cc..f9e5df23 100644
--- a/normandy/control/static/control/admin/sass/control.scss
+++ b/normandy/control/static/control/admin/sass/control.scss
@@ -330,33 +330,24 @@
 
 /* Recipe History */
 .recipe-history {
-  .history-item {
-    display: flex;
-    flex-direction: row;
+  td {
+    text-align: left;
+  }
 
-    .revision-number,
-    .revision-created {
-      line-height: 20px;
-      margin: 0 20px;
-    }
+  .revision-number {
+    font-weight: 600;
 
-    .revision-number {
-      flex: 0;
-      font-weight: 600;
-    }
+    /* Force table cell to smallest width */
+    white-space: nowrap;
+    width: 1px;
+  }
 
-    .revision-created {
-      flex: 1;
-    }
+  .status-indicator {
+    margin: 0 20px; /* Reset .status-indicator margin */
+  }
 
-    .revision-status {
-      flex: 1;
-      margin: 0 20px; /* Reset .status-indicator margin */
-    }
-
-    .label {
-      padding: 0px;
-    }
+  .label {
+    padding: 0px;
   }
 }
 
diff --git a/normandy/control/static/control/js/components/RecipeHistory.js b/normandy/control/static/control/js/components/RecipeHistory.js
index e2c54a75..c7b0cdd6 100644
--- a/normandy/control/static/control/js/components/RecipeHistory.js
+++ b/normandy/control/static/control/js/components/RecipeHistory.js
@@ -4,8 +4,8 @@ import moment from 'moment';
 import composeRecipeContainer from './RecipeContainer.js';
 import { makeApiRequest } from '../actions/ControlActions.js';
 
-class RecipeHistory extends React.Component {
-  propTypes = {
+export class RecipeHistory extends React.Component {
+  static propTypes = {
     dispatch: pt.func.isRequired,
     recipe: pt.object.isRequired,
     recipeId: pt.number.isRequired,
@@ -14,7 +14,7 @@ class RecipeHistory extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      revisionLog: [],
+      revisions: [],
     };
   }
 
@@ -29,32 +29,44 @@ class RecipeHistory extends React.Component {
     dispatch(makeApiRequest('fetchRecipeHistory', { recipeId }))
     .then(history => {
       this.setState({
-        revisionLog: history,
+        revisions: history,
       });
     });
   }
 
   render() {
     const { recipe, dispatch } = this.props;
-    return (
-      <div className="fluid-8 recipe-history">
-        <h3>Viewing revision log for: <b>{recipe ? recipe.name : ''}</b></h3>
-        <ul>
-            {this.state.revisionLog.map(revision =>
-              <HistoryItem
-                key={revision.id}
-                revision={revision}
-                recipe={recipe}
-                dispatch={dispatch}
-              />
-            )}
-        </ul>
-      </div>
-    );
+    const { revisions } = this.state;
+    return <HistoryList recipe={recipe} dispatch={dispatch} revisions={revisions} />;
   }
 }
 
-class HistoryItem extends React.Component {
+export function HistoryList({ recipe, revisions, dispatch }) {
+  return (
+    <div className="fluid-8 recipe-history">
+      <h3>Viewing revision log for: <b>{recipe ? recipe.name : ''}</b></h3>
+      <table>
+        <tbody>
+          {revisions.map(revision =>
+            <HistoryItem
+              key={revision.id}
+              revision={revision}
+              recipe={recipe}
+              dispatch={dispatch}
+            />
+          )}
+        </tbody>
+      </table>
+    </div>
+  );
+}
+HistoryList.propTypes = {
+  dispatch: pt.func.isRequired,
+  recipe: pt.object.isRequired,
+  revisions: pt.arrayOf(pt.object).isRequired,
+};
+
+export class HistoryItem extends React.Component {
   static propTypes = {
     dispatch: pt.func.isRequired,
     revision: pt.shape({
@@ -62,6 +74,7 @@ class HistoryItem extends React.Component {
         revision_id: pt.number.isRequired,
       }).isRequired,
       date_created: pt.string.isRequired,
+      comment: pt.string.isRequired,
     }).isRequired,
     recipe: pt.shape({
       revision_id: pt.number.isRequired,
@@ -93,19 +106,25 @@ class HistoryItem extends React.Component {
     const isCurrent = revision.recipe.revision_id === recipe.revision_id;
 
     return (
-      <li className="history-item" onClick={::this.handleClick}>
-        <p className="revision-number">#{revision.recipe.revision_id}</p>
-        <p className="revision-created">
+      <tr className="history-item" onClick={::this.handleClick}>
+        <td className="revision-number">#{revision.recipe.revision_id}</td>
+        <td className="revision-created">
           <span className="label">Created On:</span>
           {moment(revision.date_created).format('MMM Do YYYY - h:mmA')}
-        </p>
-        {isCurrent && (
-          <div className="revision-status status-indicator green">
-            <i className="fa fa-circle pre" />
-            Current Revision
-          </div>
-        )}
-      </li>
+        </td>
+        <td className="revision-comment">
+          <span className="label">Comment:</span>
+          {revision.comment || '--'}
+        </td>
+        <td>
+          {isCurrent && (
+            <div className="status-indicator green">
+              <i className="fa fa-circle pre" />
+              Current Revision
+            </div>
+          )}
+        </td>
+      </tr>
     );
   }
 }
diff --git a/normandy/control/tests/components/RecipeHistory.js b/normandy/control/tests/components/RecipeHistory.js
new file mode 100644
index 00000000..47bd66dc
--- /dev/null
+++ b/normandy/control/tests/components/RecipeHistory.js
@@ -0,0 +1,58 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { HistoryItem, HistoryList } from '../../static/control/js/components/RecipeHistory.js';
+
+describe('Recipe history components', () => {
+  describe('<HistoryList>', () => {
+    it('should render a <HistoryItem> for each revision', () => {
+      const recipe = { revision_id: 2 };
+      const revision1 = { id: 1 };
+      const revision2 = { id: 2 };
+      const dispatch = () => null;
+      const wrapper = shallow(
+        <HistoryList dispatch={dispatch} recipe={recipe} revisions={[revision1, revision2]} />
+      );
+
+      const items = wrapper.find(HistoryItem);
+      expect(items.length).toEqual(2);
+      expect(items.get(0).props.revision).toEqual(revision1);
+      expect(items.get(1).props.revision).toEqual(revision2);
+    });
+  });
+
+  describe('<HistoryItem>', () => {
+    it('should render the revision info', () => {
+      const dispatch = () => null;
+      const recipe = { revision_id: 1 };
+      const revision = {
+        id: 2,
+        recipe,
+        date_created: '2016-08-10T04:16:58.440Z+00:00',
+        comment: 'test comment',
+      };
+
+      const wrapper = shallow(
+        <HistoryItem revision={revision} recipe={recipe} dispatch={dispatch} />
+      );
+      expect(wrapper.find('.revision-number').text()).toContain(revision.recipe.revision_id);
+      expect(wrapper.find('.revision-comment').text()).toContain(revision.comment);
+      expect(wrapper.find('.status-indicator').text()).toContain('Current Revision');
+    });
+
+    it('should not render the status indicator if the revision is not current', () => {
+      const dispatch = () => null;
+      const recipe = { revision_id: 2 };
+      const revision = {
+        id: 3,
+        recipe: { revision_id: 1 },
+        date_created: '2016-08-10T04:16:58.440Z+00:00',
+        comment: 'test comment',
+      };
+
+      const wrapper = shallow(
+        <HistoryItem revision={revision} recipe={recipe} dispatch={dispatch} />
+      );
+      expect(wrapper.find('.status-indicator').isEmpty()).toEqual(true);
+    });
+  });
+});
diff --git a/normandy/recipes/api/serializers.py b/normandy/recipes/api/serializers.py
index 5fb0a539..16254fa6 100644
--- a/normandy/recipes/api/serializers.py
+++ b/normandy/recipes/api/serializers.py
@@ -152,6 +152,7 @@ class ClientSerializer(serializers.Serializer):
 
 class RecipeVersionSerializer(serializers.ModelSerializer):
     date_created = serializers.DateTimeField(source='revision.date_created', read_only=True)
+    comment = serializers.CharField(source='revision.comment', read_only=True)
     recipe = RecipeSerializer(source='_object_version.object', read_only=True)
 
     class Meta:
@@ -160,4 +161,5 @@ class RecipeVersionSerializer(serializers.ModelSerializer):
             'id',
             'date_created',
             'recipe',
+            'comment',
         ]

From 97e88d10ee5a1627cd0480881c4159871bb7df27 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Tue, 19 Jul 2016 11:33:41 -0700
Subject: [PATCH 70/74] Move most client side code outside of Django's grasp

---
 .../actions/console-log/index.js              |   0
 .../actions/console-log/package.json          |   0
 .../actions/show-heartbeat/index.js           |   0
 .../actions/show-heartbeat/package.json       |   0
 .../actions}/tests/.eslintrc                  |   0
 .../actions/tests}/console-log.js             |   2 +-
 .../actions => client/actions/tests}/index.js |   0
 .../actions/tests}/show-heartbeat.js          |   2 +-
 .../actions => client/actions/tests}/utils.js |   0
 .../static => client}/actions/utils.js        |   0
 .../control}/actions/ControlActions.js        |   0
 .../control/js => client/control}/app.js      |   0
 .../control}/components/ActionForm.js         |   0
 .../control}/components/ControlApp.js         |   0
 .../control}/components/DeleteRecipe.js       |   0
 .../control}/components/Header.js             |   0
 .../control}/components/NoMatch.js            |   0
 .../control}/components/Notifications.js      |   0
 .../control}/components/RecipeContainer.js    |   0
 .../control}/components/RecipeForm.js         |   2 +-
 .../control}/components/RecipeHistory.js      |   0
 .../control}/components/RecipeList.js         |   0
 .../control}/components/RecipePreview.js      |   4 +--
 .../components/action_forms/ConsoleLogForm.js |   0
 .../components/action_forms/HeartbeatForm.js  |   0
 .../components/form_fields/CheckboxField.js   |   0
 .../form_fields/FormFieldWrapper.js           |   0
 .../components/form_fields/NumberField.js     |   0
 .../control/fonts/OpenSans-Bold.woff          | Bin
 .../control/fonts/OpenSans-Light.woff         | Bin
 .../control/fonts/OpenSans-Regular.woff       | Bin
 .../control/fonts/SourceSansPro-Bold.woff     | Bin
 .../control/fonts/SourceSansPro-Light.woff    | Bin
 .../control/fonts/SourceSansPro-Regular.woff  | Bin
 .../control/js => client/control}/index.js    |   0
 .../control}/reducers/ControlAppReducer.js    |   0
 .../control/js => client/control}/routes.js   |   0
 .../control}/sass/control.scss                |   0
 .../control}/sass/partials/_colors.scss       |   0
 .../control}/sass/partials/_common.scss       |   0
 .../control}/sass/partials/_fonts.scss        |  12 ++++----
 .../control}/sass/partials/_grid.scss         |   0
 .../control}/stores/ControlStore.js           |   0
 .../control/tests}/.eslintrc                  |   0
 .../control/tests/actions/controlActions.js   |   4 +--
 .../control/tests/components/ActionForm.js    |   4 +--
 .../control/tests/components/Notifications.js |   2 +-
 .../control/tests/components/RecipeForm.js    |   4 +--
 .../control/tests/components/RecipeHistory.js |   2 +-
 .../components/action_forms/HeartbeatForm.js  |   2 +-
 .../control/tests}/fixtures.js                |   0
 {normandy => client}/control/tests/index.js   |   0
 .../tests/reducers/controlAppReducer.js       |   6 ++--
 {normandy => client}/control/tests/routes.js  |   4 +--
 .../selfrepair}/JexlEnvironment.js            |   0
 .../selfrepair}/normandy_driver.js            |   0
 .../js => client/selfrepair}/self_repair.js   |   0
 .../selfrepair}/self_repair_runner.js         |   0
 .../selfrepair/tests/.eslintrc                |   0
 .../selfrepair/tests/index.js                 |   0
 .../selfrepair/tests/test_JexlEnvironment.js  |   2 +-
 .../selfrepair/tests/test_normandy_driver.js  |   2 +-
 .../tests/test_self_repair_runner.js          |   4 +--
 .../selfrepair/tests/test_utils.js            |   2 +-
 .../static/js => client/selfrepair}/uitour.js |   0
 .../static/js => client/selfrepair}/utils.js  |   0
 karma.conf.js                                 |  29 +++++++++---------
 normandy/control/__init__.py                  |   0
 normandy/control/migrations/__init__.py       |   0
 normandy/control/models.py                    |   0
 normandy/settings.py                          |   4 +--
 webpack.config.js                             |  15 ++++-----
 72 files changed, 55 insertions(+), 53 deletions(-)
 rename {normandy/recipes/static => client}/actions/console-log/index.js (100%)
 rename {normandy/recipes/static => client}/actions/console-log/package.json (100%)
 rename {normandy/recipes/static => client}/actions/show-heartbeat/index.js (100%)
 rename {normandy/recipes/static => client}/actions/show-heartbeat/package.json (100%)
 rename {normandy/control => client/actions}/tests/.eslintrc (100%)
 rename {normandy/recipes/tests/actions => client/actions/tests}/console-log.js (85%)
 rename {normandy/recipes/tests/actions => client/actions/tests}/index.js (100%)
 rename {normandy/recipes/tests/actions => client/actions/tests}/show-heartbeat.js (99%)
 rename {normandy/recipes/tests/actions => client/actions/tests}/utils.js (100%)
 rename {normandy/recipes/static => client}/actions/utils.js (100%)
 rename {normandy/control/static/control/js => client/control}/actions/ControlActions.js (100%)
 rename {normandy/control/static/control/js => client/control}/app.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/ActionForm.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/ControlApp.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/DeleteRecipe.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/Header.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/NoMatch.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/Notifications.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/RecipeContainer.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/RecipeForm.js (98%)
 rename {normandy/control/static/control/js => client/control}/components/RecipeHistory.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/RecipeList.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/RecipePreview.js (92%)
 rename {normandy/control/static/control/js => client/control}/components/action_forms/ConsoleLogForm.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/action_forms/HeartbeatForm.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/form_fields/CheckboxField.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/form_fields/FormFieldWrapper.js (100%)
 rename {normandy/control/static/control/js => client/control}/components/form_fields/NumberField.js (100%)
 rename {normandy/control/static => client}/control/fonts/OpenSans-Bold.woff (100%)
 rename {normandy/control/static => client}/control/fonts/OpenSans-Light.woff (100%)
 rename {normandy/control/static => client}/control/fonts/OpenSans-Regular.woff (100%)
 rename {normandy/control/static => client}/control/fonts/SourceSansPro-Bold.woff (100%)
 rename {normandy/control/static => client}/control/fonts/SourceSansPro-Light.woff (100%)
 rename {normandy/control/static => client}/control/fonts/SourceSansPro-Regular.woff (100%)
 rename {normandy/control/static/control/js => client/control}/index.js (100%)
 rename {normandy/control/static/control/js => client/control}/reducers/ControlAppReducer.js (100%)
 rename {normandy/control/static/control/js => client/control}/routes.js (100%)
 rename {normandy/control/static/control/admin => client/control}/sass/control.scss (100%)
 rename {normandy/control/static/control/admin => client/control}/sass/partials/_colors.scss (100%)
 rename {normandy/control/static/control/admin => client/control}/sass/partials/_common.scss (100%)
 rename {normandy/control/static/control/admin => client/control}/sass/partials/_fonts.scss (63%)
 rename {normandy/control/static/control/admin => client/control}/sass/partials/_grid.scss (100%)
 rename {normandy/control/static/control/js => client/control}/stores/ControlStore.js (100%)
 rename {normandy/recipes/tests/actions => client/control/tests}/.eslintrc (100%)
 rename {normandy => client}/control/tests/actions/controlActions.js (97%)
 rename {normandy => client}/control/tests/components/ActionForm.js (83%)
 rename {normandy => client}/control/tests/components/Notifications.js (91%)
 rename {normandy => client}/control/tests/components/RecipeForm.js (78%)
 rename {normandy => client}/control/tests/components/RecipeHistory.js (95%)
 rename {normandy => client}/control/tests/components/action_forms/HeartbeatForm.js (70%)
 rename {normandy/control/tests/fixtures => client/control/tests}/fixtures.js (100%)
 rename {normandy => client}/control/tests/index.js (100%)
 rename {normandy => client}/control/tests/reducers/controlAppReducer.js (94%)
 rename {normandy => client}/control/tests/routes.js (76%)
 rename {normandy/selfrepair/static/js => client/selfrepair}/JexlEnvironment.js (100%)
 rename {normandy/selfrepair/static/js => client/selfrepair}/normandy_driver.js (100%)
 rename {normandy/selfrepair/static/js => client/selfrepair}/self_repair.js (100%)
 rename {normandy/selfrepair/static/js => client/selfrepair}/self_repair_runner.js (100%)
 rename {normandy => client}/selfrepair/tests/.eslintrc (100%)
 rename {normandy => client}/selfrepair/tests/index.js (100%)
 rename normandy/selfrepair/tests/test_JexlEnv.js => client/selfrepair/tests/test_JexlEnvironment.js (95%)
 rename {normandy => client}/selfrepair/tests/test_normandy_driver.js (95%)
 rename {normandy => client}/selfrepair/tests/test_self_repair_runner.js (94%)
 rename {normandy => client}/selfrepair/tests/test_utils.js (97%)
 rename {normandy/selfrepair/static/js => client/selfrepair}/uitour.js (100%)
 rename {normandy/selfrepair/static/js => client/selfrepair}/utils.js (100%)
 delete mode 100644 normandy/control/__init__.py
 delete mode 100644 normandy/control/migrations/__init__.py
 delete mode 100644 normandy/control/models.py

diff --git a/normandy/recipes/static/actions/console-log/index.js b/client/actions/console-log/index.js
similarity index 100%
rename from normandy/recipes/static/actions/console-log/index.js
rename to client/actions/console-log/index.js
diff --git a/normandy/recipes/static/actions/console-log/package.json b/client/actions/console-log/package.json
similarity index 100%
rename from normandy/recipes/static/actions/console-log/package.json
rename to client/actions/console-log/package.json
diff --git a/normandy/recipes/static/actions/show-heartbeat/index.js b/client/actions/show-heartbeat/index.js
similarity index 100%
rename from normandy/recipes/static/actions/show-heartbeat/index.js
rename to client/actions/show-heartbeat/index.js
diff --git a/normandy/recipes/static/actions/show-heartbeat/package.json b/client/actions/show-heartbeat/package.json
similarity index 100%
rename from normandy/recipes/static/actions/show-heartbeat/package.json
rename to client/actions/show-heartbeat/package.json
diff --git a/normandy/control/tests/.eslintrc b/client/actions/tests/.eslintrc
similarity index 100%
rename from normandy/control/tests/.eslintrc
rename to client/actions/tests/.eslintrc
diff --git a/normandy/recipes/tests/actions/console-log.js b/client/actions/tests/console-log.js
similarity index 85%
rename from normandy/recipes/tests/actions/console-log.js
rename to client/actions/tests/console-log.js
index 725b2c29..4848c6dc 100644
--- a/normandy/recipes/tests/actions/console-log.js
+++ b/client/actions/tests/console-log.js
@@ -1,5 +1,5 @@
 import { mockNormandy } from './utils';
-import ConsoleLogAction from '../../static/actions/console-log/index';
+import ConsoleLogAction from '../console-log/';
 
 
 describe('ConsoleLogAction', () => {
diff --git a/normandy/recipes/tests/actions/index.js b/client/actions/tests/index.js
similarity index 100%
rename from normandy/recipes/tests/actions/index.js
rename to client/actions/tests/index.js
diff --git a/normandy/recipes/tests/actions/show-heartbeat.js b/client/actions/tests/show-heartbeat.js
similarity index 99%
rename from normandy/recipes/tests/actions/show-heartbeat.js
rename to client/actions/tests/show-heartbeat.js
index fa70f60b..9edadf51 100644
--- a/normandy/recipes/tests/actions/show-heartbeat.js
+++ b/client/actions/tests/show-heartbeat.js
@@ -1,5 +1,5 @@
 import { mockNormandy, pluginFactory } from './utils';
-import ShowHeartbeatAction from '../../static/actions/show-heartbeat/index';
+import ShowHeartbeatAction from '../show-heartbeat/';
 
 
 function surveyFactory(props = {}) {
diff --git a/normandy/recipes/tests/actions/utils.js b/client/actions/tests/utils.js
similarity index 100%
rename from normandy/recipes/tests/actions/utils.js
rename to client/actions/tests/utils.js
diff --git a/normandy/recipes/static/actions/utils.js b/client/actions/utils.js
similarity index 100%
rename from normandy/recipes/static/actions/utils.js
rename to client/actions/utils.js
diff --git a/normandy/control/static/control/js/actions/ControlActions.js b/client/control/actions/ControlActions.js
similarity index 100%
rename from normandy/control/static/control/js/actions/ControlActions.js
rename to client/control/actions/ControlActions.js
diff --git a/normandy/control/static/control/js/app.js b/client/control/app.js
similarity index 100%
rename from normandy/control/static/control/js/app.js
rename to client/control/app.js
diff --git a/normandy/control/static/control/js/components/ActionForm.js b/client/control/components/ActionForm.js
similarity index 100%
rename from normandy/control/static/control/js/components/ActionForm.js
rename to client/control/components/ActionForm.js
diff --git a/normandy/control/static/control/js/components/ControlApp.js b/client/control/components/ControlApp.js
similarity index 100%
rename from normandy/control/static/control/js/components/ControlApp.js
rename to client/control/components/ControlApp.js
diff --git a/normandy/control/static/control/js/components/DeleteRecipe.js b/client/control/components/DeleteRecipe.js
similarity index 100%
rename from normandy/control/static/control/js/components/DeleteRecipe.js
rename to client/control/components/DeleteRecipe.js
diff --git a/normandy/control/static/control/js/components/Header.js b/client/control/components/Header.js
similarity index 100%
rename from normandy/control/static/control/js/components/Header.js
rename to client/control/components/Header.js
diff --git a/normandy/control/static/control/js/components/NoMatch.js b/client/control/components/NoMatch.js
similarity index 100%
rename from normandy/control/static/control/js/components/NoMatch.js
rename to client/control/components/NoMatch.js
diff --git a/normandy/control/static/control/js/components/Notifications.js b/client/control/components/Notifications.js
similarity index 100%
rename from normandy/control/static/control/js/components/Notifications.js
rename to client/control/components/Notifications.js
diff --git a/normandy/control/static/control/js/components/RecipeContainer.js b/client/control/components/RecipeContainer.js
similarity index 100%
rename from normandy/control/static/control/js/components/RecipeContainer.js
rename to client/control/components/RecipeContainer.js
diff --git a/normandy/control/static/control/js/components/RecipeForm.js b/client/control/components/RecipeForm.js
similarity index 98%
rename from normandy/control/static/control/js/components/RecipeForm.js
rename to client/control/components/RecipeForm.js
index 35fc5dad..72801c71 100644
--- a/normandy/control/static/control/js/components/RecipeForm.js
+++ b/client/control/components/RecipeForm.js
@@ -10,7 +10,7 @@ import composeRecipeContainer from './RecipeContainer.js';
 import ActionForm from './ActionForm.js';
 import CheckboxField from './form_fields/CheckboxField.js';
 import FormField from './form_fields/FormFieldWrapper.js';
-import JexlEnvironment from '../../../../../selfrepair/static/js/JexlEnvironment.js';
+import JexlEnvironment from '../../selfrepair/JexlEnvironment.js';
 
 export class RecipeForm extends React.Component {
   static propTypes = {
diff --git a/normandy/control/static/control/js/components/RecipeHistory.js b/client/control/components/RecipeHistory.js
similarity index 100%
rename from normandy/control/static/control/js/components/RecipeHistory.js
rename to client/control/components/RecipeHistory.js
diff --git a/normandy/control/static/control/js/components/RecipeList.js b/client/control/components/RecipeList.js
similarity index 100%
rename from normandy/control/static/control/js/components/RecipeList.js
rename to client/control/components/RecipeList.js
diff --git a/normandy/control/static/control/js/components/RecipePreview.js b/client/control/components/RecipePreview.js
similarity index 92%
rename from normandy/control/static/control/js/components/RecipePreview.js
rename to client/control/components/RecipePreview.js
index e457efda..3abde8b7 100644
--- a/normandy/control/static/control/js/components/RecipePreview.js
+++ b/client/control/components/RecipePreview.js
@@ -1,8 +1,8 @@
 import React, { PropTypes as pt } from 'react';
 import classNames from 'classnames';
 import composeRecipeContainer from './RecipeContainer.js';
-import { runRecipe } from '../../../../../selfrepair/static/js/self_repair_runner.js';
-import NormandyDriver from '../../../../../selfrepair/static/js/normandy_driver.js';
+import { runRecipe } from '../../selfrepair/self_repair_runner.js';
+import NormandyDriver from '../../selfrepair/normandy_driver.js';
 
 class RecipePreview extends React.Component {
   propTypes = {
diff --git a/normandy/control/static/control/js/components/action_forms/ConsoleLogForm.js b/client/control/components/action_forms/ConsoleLogForm.js
similarity index 100%
rename from normandy/control/static/control/js/components/action_forms/ConsoleLogForm.js
rename to client/control/components/action_forms/ConsoleLogForm.js
diff --git a/normandy/control/static/control/js/components/action_forms/HeartbeatForm.js b/client/control/components/action_forms/HeartbeatForm.js
similarity index 100%
rename from normandy/control/static/control/js/components/action_forms/HeartbeatForm.js
rename to client/control/components/action_forms/HeartbeatForm.js
diff --git a/normandy/control/static/control/js/components/form_fields/CheckboxField.js b/client/control/components/form_fields/CheckboxField.js
similarity index 100%
rename from normandy/control/static/control/js/components/form_fields/CheckboxField.js
rename to client/control/components/form_fields/CheckboxField.js
diff --git a/normandy/control/static/control/js/components/form_fields/FormFieldWrapper.js b/client/control/components/form_fields/FormFieldWrapper.js
similarity index 100%
rename from normandy/control/static/control/js/components/form_fields/FormFieldWrapper.js
rename to client/control/components/form_fields/FormFieldWrapper.js
diff --git a/normandy/control/static/control/js/components/form_fields/NumberField.js b/client/control/components/form_fields/NumberField.js
similarity index 100%
rename from normandy/control/static/control/js/components/form_fields/NumberField.js
rename to client/control/components/form_fields/NumberField.js
diff --git a/normandy/control/static/control/fonts/OpenSans-Bold.woff b/client/control/fonts/OpenSans-Bold.woff
similarity index 100%
rename from normandy/control/static/control/fonts/OpenSans-Bold.woff
rename to client/control/fonts/OpenSans-Bold.woff
diff --git a/normandy/control/static/control/fonts/OpenSans-Light.woff b/client/control/fonts/OpenSans-Light.woff
similarity index 100%
rename from normandy/control/static/control/fonts/OpenSans-Light.woff
rename to client/control/fonts/OpenSans-Light.woff
diff --git a/normandy/control/static/control/fonts/OpenSans-Regular.woff b/client/control/fonts/OpenSans-Regular.woff
similarity index 100%
rename from normandy/control/static/control/fonts/OpenSans-Regular.woff
rename to client/control/fonts/OpenSans-Regular.woff
diff --git a/normandy/control/static/control/fonts/SourceSansPro-Bold.woff b/client/control/fonts/SourceSansPro-Bold.woff
similarity index 100%
rename from normandy/control/static/control/fonts/SourceSansPro-Bold.woff
rename to client/control/fonts/SourceSansPro-Bold.woff
diff --git a/normandy/control/static/control/fonts/SourceSansPro-Light.woff b/client/control/fonts/SourceSansPro-Light.woff
similarity index 100%
rename from normandy/control/static/control/fonts/SourceSansPro-Light.woff
rename to client/control/fonts/SourceSansPro-Light.woff
diff --git a/normandy/control/static/control/fonts/SourceSansPro-Regular.woff b/client/control/fonts/SourceSansPro-Regular.woff
similarity index 100%
rename from normandy/control/static/control/fonts/SourceSansPro-Regular.woff
rename to client/control/fonts/SourceSansPro-Regular.woff
diff --git a/normandy/control/static/control/js/index.js b/client/control/index.js
similarity index 100%
rename from normandy/control/static/control/js/index.js
rename to client/control/index.js
diff --git a/normandy/control/static/control/js/reducers/ControlAppReducer.js b/client/control/reducers/ControlAppReducer.js
similarity index 100%
rename from normandy/control/static/control/js/reducers/ControlAppReducer.js
rename to client/control/reducers/ControlAppReducer.js
diff --git a/normandy/control/static/control/js/routes.js b/client/control/routes.js
similarity index 100%
rename from normandy/control/static/control/js/routes.js
rename to client/control/routes.js
diff --git a/normandy/control/static/control/admin/sass/control.scss b/client/control/sass/control.scss
similarity index 100%
rename from normandy/control/static/control/admin/sass/control.scss
rename to client/control/sass/control.scss
diff --git a/normandy/control/static/control/admin/sass/partials/_colors.scss b/client/control/sass/partials/_colors.scss
similarity index 100%
rename from normandy/control/static/control/admin/sass/partials/_colors.scss
rename to client/control/sass/partials/_colors.scss
diff --git a/normandy/control/static/control/admin/sass/partials/_common.scss b/client/control/sass/partials/_common.scss
similarity index 100%
rename from normandy/control/static/control/admin/sass/partials/_common.scss
rename to client/control/sass/partials/_common.scss
diff --git a/normandy/control/static/control/admin/sass/partials/_fonts.scss b/client/control/sass/partials/_fonts.scss
similarity index 63%
rename from normandy/control/static/control/admin/sass/partials/_fonts.scss
rename to client/control/sass/partials/_fonts.scss
index 2f2ccfe6..37fad3a5 100644
--- a/normandy/control/static/control/admin/sass/partials/_fonts.scss
+++ b/client/control/sass/partials/_fonts.scss
@@ -1,37 +1,37 @@
 @font-face {
   font-family: 'OpenSans';
   font-weight: 300;
-  src: url('../../fonts/OpenSans-Light.woff');
+  src: url('../fonts/OpenSans-Light.woff');
 }
 
 @font-face {
   font-family: 'OpenSans';
   font-weight: 400;
-  src: url('../../fonts/OpenSans-Regular.woff');
+  src: url('../fonts/OpenSans-Regular.woff');
 }
 
 @font-face {
   font-family: 'OpenSans';
   font-weight: 600;
-  src: url('../../fonts/OpenSans-Bold.woff');
+  src: url('../fonts/OpenSans-Bold.woff');
 }
 
 @font-face {
   font-family: 'Source Sans Pro';
   font-weight: 300;
-  src: url('../../fonts/SourceSansPro-Light.woff');
+  src: url('../fonts/SourceSansPro-Light.woff');
 }
 
 @font-face {
   font-family: 'Source Sans Pro';
   font-weight: 400;
-  src: url('../../fonts/SourceSansPro-Regular.woff');
+  src: url('../fonts/SourceSansPro-Regular.woff');
 }
 
 @font-face {
   font-family: 'Source Sans Pro';
   font-weight: 600;
-  src: url('../../fonts/SourceSansPro-Bold.woff');
+  src: url('../fonts/SourceSansPro-Bold.woff');
 }
 
 $OpenSans: 'OpenSans', Verdana, Arial, sans-serif;
diff --git a/normandy/control/static/control/admin/sass/partials/_grid.scss b/client/control/sass/partials/_grid.scss
similarity index 100%
rename from normandy/control/static/control/admin/sass/partials/_grid.scss
rename to client/control/sass/partials/_grid.scss
diff --git a/normandy/control/static/control/js/stores/ControlStore.js b/client/control/stores/ControlStore.js
similarity index 100%
rename from normandy/control/static/control/js/stores/ControlStore.js
rename to client/control/stores/ControlStore.js
diff --git a/normandy/recipes/tests/actions/.eslintrc b/client/control/tests/.eslintrc
similarity index 100%
rename from normandy/recipes/tests/actions/.eslintrc
rename to client/control/tests/.eslintrc
diff --git a/normandy/control/tests/actions/controlActions.js b/client/control/tests/actions/controlActions.js
similarity index 97%
rename from normandy/control/tests/actions/controlActions.js
rename to client/control/tests/actions/controlActions.js
index 1cfb899d..c14b32b2 100644
--- a/normandy/control/tests/actions/controlActions.js
+++ b/client/control/tests/actions/controlActions.js
@@ -2,8 +2,8 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import fetchMock from 'fetch-mock';
 
-import { fixtureRecipes, initialState } from '../fixtures/fixtures';
-import * as actionTypes from '../../static/control/js/actions/ControlActions';
+import { fixtureRecipes, initialState } from '../fixtures.js';
+import * as actionTypes from '../../actions/ControlActions.js';
 
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
diff --git a/normandy/control/tests/components/ActionForm.js b/client/control/tests/components/ActionForm.js
similarity index 83%
rename from normandy/control/tests/components/ActionForm.js
rename to client/control/tests/components/ActionForm.js
index fa45a4d7..a1268a1f 100644
--- a/normandy/control/tests/components/ActionForm.js
+++ b/client/control/tests/components/ActionForm.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { Provider } from 'react-redux';
-import controlStore from '../../static/control/js/stores/ControlStore.js';
+import controlStore from '../../stores/ControlStore.js';
 
-import ActionForm from '../../static/control/js/components/ActionForm.js';
+import ActionForm from '../../components/ActionForm.js';
 
 describe('<ActionForm>', () => {
   let store;
diff --git a/normandy/control/tests/components/Notifications.js b/client/control/tests/components/Notifications.js
similarity index 91%
rename from normandy/control/tests/components/Notifications.js
rename to client/control/tests/components/Notifications.js
index 42db46c7..783fb164 100644
--- a/normandy/control/tests/components/Notifications.js
+++ b/client/control/tests/components/Notifications.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import { Notifications, Notification } from '../../static/control/js/components/Notifications.js';
+import { Notifications, Notification } from '../../components/Notifications.js';
 
 describe('Notification components', () => {
   describe('<Notifications>', () => {
diff --git a/normandy/control/tests/components/RecipeForm.js b/client/control/tests/components/RecipeForm.js
similarity index 78%
rename from normandy/control/tests/components/RecipeForm.js
rename to client/control/tests/components/RecipeForm.js
index 5db2bf9d..bd123077 100644
--- a/normandy/control/tests/components/RecipeForm.js
+++ b/client/control/tests/components/RecipeForm.js
@@ -2,8 +2,8 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { shallow, mount } from 'enzyme';
 
-import ConnectedRecipeForm, { RecipeForm } from '../../static/control/js/components/RecipeForm.js';
-import controlStore from '../../static/control/js/stores/ControlStore.js';
+import ConnectedRecipeForm, { RecipeForm } from '../../components/RecipeForm.js';
+import controlStore from '../../stores/ControlStore.js';
 
 describe('<RecipeForm>', () => {
   beforeAll(() => {
diff --git a/normandy/control/tests/components/RecipeHistory.js b/client/control/tests/components/RecipeHistory.js
similarity index 95%
rename from normandy/control/tests/components/RecipeHistory.js
rename to client/control/tests/components/RecipeHistory.js
index 47bd66dc..32782f94 100644
--- a/normandy/control/tests/components/RecipeHistory.js
+++ b/client/control/tests/components/RecipeHistory.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import { HistoryItem, HistoryList } from '../../static/control/js/components/RecipeHistory.js';
+import { HistoryItem, HistoryList } from '../../components/RecipeHistory.js';
 
 describe('Recipe history components', () => {
   describe('<HistoryList>', () => {
diff --git a/normandy/control/tests/components/action_forms/HeartbeatForm.js b/client/control/tests/components/action_forms/HeartbeatForm.js
similarity index 70%
rename from normandy/control/tests/components/action_forms/HeartbeatForm.js
rename to client/control/tests/components/action_forms/HeartbeatForm.js
index d672a6ff..c2a59118 100644
--- a/normandy/control/tests/components/action_forms/HeartbeatForm.js
+++ b/client/control/tests/components/action_forms/HeartbeatForm.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import HeartbeatForm from '../../../static/control/js/components/action_forms/HeartbeatForm.js';
+import HeartbeatForm from '../../../components/action_forms/HeartbeatForm.js';
 
 
 describe('<HeartbeatForm>', () => {
diff --git a/normandy/control/tests/fixtures/fixtures.js b/client/control/tests/fixtures.js
similarity index 100%
rename from normandy/control/tests/fixtures/fixtures.js
rename to client/control/tests/fixtures.js
diff --git a/normandy/control/tests/index.js b/client/control/tests/index.js
similarity index 100%
rename from normandy/control/tests/index.js
rename to client/control/tests/index.js
diff --git a/normandy/control/tests/reducers/controlAppReducer.js b/client/control/tests/reducers/controlAppReducer.js
similarity index 94%
rename from normandy/control/tests/reducers/controlAppReducer.js
rename to client/control/tests/reducers/controlAppReducer.js
index 3d4acd94..ee9a2e79 100644
--- a/normandy/control/tests/reducers/controlAppReducer.js
+++ b/client/control/tests/reducers/controlAppReducer.js
@@ -1,6 +1,6 @@
-import controlAppReducer from '../../static/control/js/reducers/ControlAppReducer';
-import * as actions from '../../static/control/js/actions/ControlActions';
-import { fixtureRecipes, initialState } from '../fixtures/fixtures';
+import controlAppReducer from '../../reducers/ControlAppReducer';
+import * as actions from '../../actions/ControlActions';
+import { fixtureRecipes, initialState } from '../fixtures.js';
 
 describe('controlApp reducer', () => {
   it('should return initial state by default', () => {
diff --git a/normandy/control/tests/routes.js b/client/control/tests/routes.js
similarity index 76%
rename from normandy/control/tests/routes.js
rename to client/control/tests/routes.js
index 6f8bf258..8772474d 100644
--- a/normandy/control/tests/routes.js
+++ b/client/control/tests/routes.js
@@ -1,8 +1,8 @@
 import { push } from 'react-router-redux';
 import { shallow } from 'enzyme';
 
-import { createApp } from '../static/control/js/app.js';
-import NoMatch from '../static/control/js/components/NoMatch.js';
+import { createApp } from '../app.js';
+import NoMatch from '../components/NoMatch.js';
 
 describe('Control routes', () => {
   let app;
diff --git a/normandy/selfrepair/static/js/JexlEnvironment.js b/client/selfrepair/JexlEnvironment.js
similarity index 100%
rename from normandy/selfrepair/static/js/JexlEnvironment.js
rename to client/selfrepair/JexlEnvironment.js
diff --git a/normandy/selfrepair/static/js/normandy_driver.js b/client/selfrepair/normandy_driver.js
similarity index 100%
rename from normandy/selfrepair/static/js/normandy_driver.js
rename to client/selfrepair/normandy_driver.js
diff --git a/normandy/selfrepair/static/js/self_repair.js b/client/selfrepair/self_repair.js
similarity index 100%
rename from normandy/selfrepair/static/js/self_repair.js
rename to client/selfrepair/self_repair.js
diff --git a/normandy/selfrepair/static/js/self_repair_runner.js b/client/selfrepair/self_repair_runner.js
similarity index 100%
rename from normandy/selfrepair/static/js/self_repair_runner.js
rename to client/selfrepair/self_repair_runner.js
diff --git a/normandy/selfrepair/tests/.eslintrc b/client/selfrepair/tests/.eslintrc
similarity index 100%
rename from normandy/selfrepair/tests/.eslintrc
rename to client/selfrepair/tests/.eslintrc
diff --git a/normandy/selfrepair/tests/index.js b/client/selfrepair/tests/index.js
similarity index 100%
rename from normandy/selfrepair/tests/index.js
rename to client/selfrepair/tests/index.js
diff --git a/normandy/selfrepair/tests/test_JexlEnv.js b/client/selfrepair/tests/test_JexlEnvironment.js
similarity index 95%
rename from normandy/selfrepair/tests/test_JexlEnv.js
rename to client/selfrepair/tests/test_JexlEnvironment.js
index f9610e50..72a0b519 100644
--- a/normandy/selfrepair/tests/test_JexlEnv.js
+++ b/client/selfrepair/tests/test_JexlEnvironment.js
@@ -1,4 +1,4 @@
-import JexlEnvironment from '../static/js/JexlEnvironment.js';
+import JexlEnvironment from '../JexlEnvironment.js';
 
 describe('JexlEnvironment', () => {
   let jexlEnv;
diff --git a/normandy/selfrepair/tests/test_normandy_driver.js b/client/selfrepair/tests/test_normandy_driver.js
similarity index 95%
rename from normandy/selfrepair/tests/test_normandy_driver.js
rename to client/selfrepair/tests/test_normandy_driver.js
index 08f4c043..1376ab84 100644
--- a/normandy/selfrepair/tests/test_normandy_driver.js
+++ b/client/selfrepair/tests/test_normandy_driver.js
@@ -1,4 +1,4 @@
-import NormandyDriver from '../static/js/normandy_driver.js';
+import NormandyDriver from '../normandy_driver.js';
 
 describe('Normandy Driver', () => {
   describe('showHeartbeat', () => {
diff --git a/normandy/selfrepair/tests/test_self_repair_runner.js b/client/selfrepair/tests/test_self_repair_runner.js
similarity index 94%
rename from normandy/selfrepair/tests/test_self_repair_runner.js
rename to client/selfrepair/tests/test_self_repair_runner.js
index 65bf66f4..21368cb4 100644
--- a/normandy/selfrepair/tests/test_self_repair_runner.js
+++ b/client/selfrepair/tests/test_self_repair_runner.js
@@ -1,7 +1,7 @@
 import fetchMock from 'fetch-mock';
-import { mockNormandy } from '../../recipes/tests/actions/utils.js';
 
-import { classifyClient, doesRecipeMatch, filterContext } from '../static/js/self_repair_runner.js';
+import { mockNormandy } from '../../actions/tests/utils.js';
+import { classifyClient, doesRecipeMatch, filterContext } from '../self_repair_runner.js';
 
 
 const UUID_ISH_REGEX = /^[a-f0-9-]{36}$/;
diff --git a/normandy/selfrepair/tests/test_utils.js b/client/selfrepair/tests/test_utils.js
similarity index 97%
rename from normandy/selfrepair/tests/test_utils.js
rename to client/selfrepair/tests/test_utils.js
index 208024a9..026b89d0 100644
--- a/normandy/selfrepair/tests/test_utils.js
+++ b/client/selfrepair/tests/test_utils.js
@@ -1,4 +1,4 @@
-import { fractionToKey, stableSample } from '../static/js/utils';
+import { fractionToKey, stableSample } from '../utils';
 
 function repeatString(char, times) {
   let acc = '';
diff --git a/normandy/selfrepair/static/js/uitour.js b/client/selfrepair/uitour.js
similarity index 100%
rename from normandy/selfrepair/static/js/uitour.js
rename to client/selfrepair/uitour.js
diff --git a/normandy/selfrepair/static/js/utils.js b/client/selfrepair/utils.js
similarity index 100%
rename from normandy/selfrepair/static/js/utils.js
rename to client/selfrepair/utils.js
diff --git a/karma.conf.js b/karma.conf.js
index 332b7603..a4e0eab6 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,30 +1,31 @@
-/* eslint-disable func-names, no-var */
+/* eslint-env node */
+/* eslint-disable no-var, func-names, prefer-arrow-callback, prefer-template */
 // Karma configuration
 module.exports = function (config) {
   var karmaConfig = {
-        // base path that will be used to resolve all patterns (eg. files, exclude)
+    // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: '',
 
-        // frameworks to use
-        // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
     frameworks: ['jasmine'],
 
-        // list of files / patterns to load in the browser
+    // list of files / patterns to load in the browser
     files: [
       'node_modules/babel-polyfill/dist/polyfill.js',
       'node_modules/jasmine-promises/dist/jasmine-promises.js',
-      'normandy/control/tests/index.js',
-      'normandy/recipes/tests/actions/index.js',
-      'normandy/selfrepair/tests/index.js',
+      'client/control/tests/index.js',
+      'client/actions/tests/index.js',
+      'client/selfrepair/tests/index.js',
     ],
 
-        // preprocess matching files before serving them to the browser
-        // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-      'normandy/control/tests/index.js': ['webpack', 'sourcemap'],
-      'normandy/recipes/tests/actions/index.js': ['webpack', 'sourcemap'],
-      'normandy/selfrepair/tests/index.js': ['webpack', 'sourcemap'],
-      'normandy/control/static/control/js/components/*.js': ['react-jsx'],
+      'client/control/tests/index.js': ['webpack', 'sourcemap'],
+      'client/selfrepair/tests/index.js': ['webpack', 'sourcemap'],
+      'client/control/components/*.js': ['react-jsx'],
+      'client/actions/tests/index.js': ['webpack', 'sourcemap'],
     },
 
     webpack: {
diff --git a/normandy/control/__init__.py b/normandy/control/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/normandy/control/migrations/__init__.py b/normandy/control/migrations/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/normandy/control/models.py b/normandy/control/models.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/normandy/settings.py b/normandy/settings.py
index bf218591..a66624c3 100644
--- a/normandy/settings.py
+++ b/normandy/settings.py
@@ -120,8 +120,8 @@ class Core(Configuration):
 
     # Action names and the path they are located at.
     ACTIONS = {
-        'console-log': os.path.join(BASE_DIR, 'normandy/recipes/static/actions/console-log'),
-        'show-heartbeat': os.path.join(BASE_DIR, 'normandy/recipes/static/actions/show-heartbeat'),
+        'console-log': os.path.join(BASE_DIR, 'client/actions/console-log'),
+        'show-heartbeat': os.path.join(BASE_DIR, 'client/actions/show-heartbeat'),
     }
 
 
diff --git a/webpack.config.js b/webpack.config.js
index 137f5468..bd557a79 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,3 +1,4 @@
+/* eslint-env node */
 /* eslint-disable no-var, func-names, prefer-arrow-callback, prefer-template */
 var path = require('path');
 var webpack = require('webpack');
@@ -18,12 +19,12 @@ module.exports = [
     entry: {
       selfrepair: [
         'babel-polyfill',
-        './normandy/selfrepair/static/js/self_repair',
+        './client/selfrepair/self_repair.js',
       ],
       control: [
         'babel-polyfill',
-        './normandy/control/static/control/js/index',
-        './normandy/control/static/control/admin/sass/control.scss',
+        './client/control/index.js',
+        './client/control/sass/control.scss',
         './node_modules/font-awesome/scss/font-awesome.scss',
       ],
     },
@@ -62,8 +63,8 @@ module.exports = [
   },
   {
     entry: {
-      'console-log': './normandy/recipes/static/actions/console-log/index',
-      'show-heartbeat': './normandy/recipes/static/actions/show-heartbeat/index',
+      'console-log': './client/actions/console-log/index',
+      'show-heartbeat': './client/actions/show-heartbeat/index',
     },
 
     plugins: [
@@ -75,10 +76,10 @@ module.exports = [
         // Small plugin to update the actions in the database if
         // --update-actions was passed.
       function updateActions() {
-        var cmd;
         this.plugin('done', function () {
+          var cmd;
           if (argv['update-actions']) {
-              // Don't disable actions since this is mostly for development.
+            // Don't disable actions since this is mostly for development.
             cmd = 'python manage.py update_actions --no-disable';
 
             childProcess.exec(cmd, function (err, stdout, stderr) {

From 33469508ae61f84a2b167302781ad7fb6b6dc440 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Tue, 16 Aug 2016 21:56:13 +0000
Subject: [PATCH 71/74] Remove leftover models for server-side filters

---
 bin/ci/contract-tests.sh                      |  2 -
 docs/dev/install.rst                          | 16 ++------
 docs/dev/workflow.rst                         |  4 +-
 docs/qa/setup.rst                             |  2 +-
 .../base/management/commands/initial_data.py  | 34 ----------------
 normandy/base/tests/test_commands.py          |  9 -----
 normandy/recipes/admin/forms.py               | 36 -----------------
 normandy/recipes/admin/model_admins.py        |  5 ---
 .../migrations/0030_auto_20160816_2154.py     | 24 ++++++++++++
 normandy/recipes/models.py                    | 39 -------------------
 normandy/recipes/storage.py                   | 36 -----------------
 normandy/recipes/tests/__init__.py            | 35 -----------------
 normandy/settings.py                          |  2 -
 requirements.txt                              |  3 --
 14 files changed, 31 insertions(+), 216 deletions(-)
 delete mode 100644 normandy/base/management/commands/initial_data.py
 delete mode 100644 normandy/base/tests/test_commands.py
 delete mode 100644 normandy/recipes/admin/forms.py
 create mode 100644 normandy/recipes/migrations/0030_auto_20160816_2154.py
 delete mode 100644 normandy/recipes/storage.py

diff --git a/bin/ci/contract-tests.sh b/bin/ci/contract-tests.sh
index d2cce11c..ba5b7179 100755
--- a/bin/ci/contract-tests.sh
+++ b/bin/ci/contract-tests.sh
@@ -7,8 +7,6 @@ cd $BASE_DIR
 echo "Setting up Normandy"
 createdb normandy
 ./docker-run.sh -i -t ./manage.py migrate
-./docker-run.sh -i -t ./manage.py update_product_details
-./docker-run.sh -i -t ./manage.py initial_data
 ./docker-run.sh -i -t ./manage.py update_actions
 echo "Starting Normandy server"
 SERVER_ID=$(./docker-run.sh -e DJANGO_CONFIGURATION=ProductionInsecure -d)
diff --git a/docs/dev/install.rst b/docs/dev/install.rst
index 5cfee707..8cbc185b 100644
--- a/docs/dev/install.rst
+++ b/docs/dev/install.rst
@@ -100,26 +100,18 @@ Installation
 
       python manage.py createsuperuser
 
-9. Pull the latest data on Firefox releases and supported locales with the
-   ``update_product_details`` command:
-
-   .. code-block:: bash
-
-      python manage.py update_product_details
-
-10. Pull the latest geolocation database using the ``download_geolite2.sh``
+9. Pull the latest geolocation database using the ``download_geolite2.sh``
    script:
 
    .. code-block:: bash
 
       ./bin/download_geolite2.sh
 
-11. Add some useful initial data to your database using the ``initial_data``
-    command:
+10. Load actions into the database:
 
-    .. code-block:: bash
+   .. code-block:: bash
 
-       python manage.py initial_data
+      python manage.py update_actions
 
 Once you've finished these steps, you should be able to start the site by
 running:
diff --git a/docs/dev/workflow.rst b/docs/dev/workflow.rst
index 9afb862c..06befbe1 100644
--- a/docs/dev/workflow.rst
+++ b/docs/dev/workflow.rst
@@ -40,8 +40,8 @@ steps, as they don't affect your setup if nothing has changed:
    # Run database migrations.
    python manage.py migrate
 
-   # Add any new initial data (does not duplicate data).
-   python manage.py initial_data
+   # Add any new action data (does not duplicate data).
+   python manage.py update_actions
 
    # Build frontend files
    ./node_modules/.bin/webpack --config ./webpack.config.js --update-actions
diff --git a/docs/qa/setup.rst b/docs/qa/setup.rst
index 1d5cc85b..cd0c86cd 100644
--- a/docs/qa/setup.rst
+++ b/docs/qa/setup.rst
@@ -47,7 +47,7 @@ Starting the server, and initial setup
    .. code-block:: shell
 
      $ docker-compose run normandy ./manage.py migrate
-     $ docker-compose run normandy ./manage.py initial_data
+     $ docker-compose run normandy ./manage.py update_actions
      $ docker-compose run normandy ./manage.py createsuperuser
 
 4. Open the site. If you are using Docker Machine, get your VM's IP with
diff --git a/normandy/base/management/commands/initial_data.py b/normandy/base/management/commands/initial_data.py
deleted file mode 100644
index 2714f70e..00000000
--- a/normandy/base/management/commands/initial_data.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from django.core.management.base import BaseCommand
-
-from normandy.recipes.models import ReleaseChannel
-
-
-class Command(BaseCommand):
-    """
-    Adds some helpful initial data to the site's database. If matching
-    data already exists, it should _not_ be overwritten, making this
-    safe to run multiple times.
-
-    This exists instead of data migrations so that test runs do not load
-    this data into the test database.
-
-    If this file grows too big, we should consider finding a library or
-    coming up with a more robust way of adding this data.
-    """
-    help = 'Adds initial data to database'
-
-    def handle(self, *args, **options):
-        self.add_release_channels()
-
-    def add_release_channels(self):
-        self.stdout.write('Adding Release Channels...', ending='')
-        channels = {
-            'release': 'Release',
-            'beta': 'Beta',
-            'aurora': 'Developer Edition',
-            'nightly': 'Nightly'
-        }
-
-        for slug, name in channels.items():
-            ReleaseChannel.objects.get_or_create(slug=slug, defaults={'name': name})
-        self.stdout.write('Done')
diff --git a/normandy/base/tests/test_commands.py b/normandy/base/tests/test_commands.py
deleted file mode 100644
index e0352fc9..00000000
--- a/normandy/base/tests/test_commands.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from django.core.management import call_command
-
-import pytest
-
-
-@pytest.mark.django_db
-def test_initial_data():
-    """Verify that the initial_data command doesn't throw an error."""
-    call_command('initial_data')
diff --git a/normandy/recipes/admin/forms.py b/normandy/recipes/admin/forms.py
deleted file mode 100644
index e337f566..00000000
--- a/normandy/recipes/admin/forms.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from django import forms
-from django.contrib.admin import widgets
-from django.utils import timezone
-
-from normandy.recipes.models import Client, Country, Locale, ReleaseChannel
-
-
-class ClientForm(forms.Form):
-    """Form to specify client configurations for testing purposes."""
-    def __init__(self, *args, request=None, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.request = request
-
-    locale = forms.ModelChoiceField(Locale.objects.all(), empty_label=None, to_field_name='code')
-    release_channel = forms.ModelChoiceField(
-        ReleaseChannel.objects.all(),
-        initial='release',
-        empty_label=None,
-        to_field_name='slug'
-    )
-    country = forms.ModelChoiceField(
-        Country.objects.all(),
-        empty_label=None,
-        to_field_name='code'
-    )
-    request_time = forms.SplitDateTimeField(required=False, widget=widgets.AdminSplitDateTime)
-
-    def save(self):
-        return Client(
-            request=self.request,
-            locale=self.cleaned_data['locale'].code,
-            country=self.cleaned_data['country'].code,
-            request_time=self.cleaned_data.get('request_time', timezone.now()),
-            release_channel=self.cleaned_data['release_channel'].slug,
-            user_id=''
-        )
diff --git a/normandy/recipes/admin/model_admins.py b/normandy/recipes/admin/model_admins.py
index b56133f2..4b45064e 100644
--- a/normandy/recipes/admin/model_admins.py
+++ b/normandy/recipes/admin/model_admins.py
@@ -70,8 +70,3 @@ class ActionAdmin(VersionAdmin):
         """
         return action.in_use
     in_use.boolean = True
-
-
-@admin.register(models.ReleaseChannel)
-class ReleaseChannelAdmin(admin.ModelAdmin):
-    fields = ['name', 'slug']
diff --git a/normandy/recipes/migrations/0030_auto_20160816_2154.py b/normandy/recipes/migrations/0030_auto_20160816_2154.py
new file mode 100644
index 00000000..566b7131
--- /dev/null
+++ b/normandy/recipes/migrations/0030_auto_20160816_2154.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.8 on 2016-08-16 21:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('recipes', '0029_recipe_last_updated'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Country',
+        ),
+        migrations.DeleteModel(
+            name='Locale',
+        ),
+        migrations.DeleteModel(
+            name='ReleaseChannel',
+        ),
+    ]
diff --git a/normandy/recipes/models.py b/normandy/recipes/models.py
index 623a50dc..88aaf62b 100644
--- a/normandy/recipes/models.py
+++ b/normandy/recipes/models.py
@@ -19,45 +19,6 @@ from normandy.recipes.validators import validate_json
 logger = logging.getLogger()
 
 
-class Locale(models.Model):
-    """Database table for locales from product_details."""
-    code = models.CharField(max_length=255, unique=True)
-    english_name = models.CharField(max_length=255, blank=True)
-    native_name = models.CharField(max_length=255, blank=True)
-    order = models.IntegerField(default=100)
-
-    class Meta:
-        ordering = ['order', 'code']
-
-    def __str__(self):
-        return '{self.code} ({self.english_name})'.format(self=self)
-
-
-class ReleaseChannel(models.Model):
-    """Release channel of Firefox"""
-    slug = models.SlugField(max_length=255, unique=True)
-    name = models.CharField(max_length=255)
-
-    class Meta:
-        ordering = ['slug']
-
-    def __str__(self):
-        return self.name
-
-
-class Country(models.Model):
-    """Database table for countries from django_countries."""
-    code = models.CharField(max_length=255, unique=True)
-    name = models.CharField(max_length=255)
-    order = models.IntegerField(default=100)
-
-    class Meta:
-        ordering = ['order', 'name']
-
-    def __str__(self):
-        return '{self.name} ({self.code})'.format(self=self)
-
-
 class Approval(models.Model):
     created = models.DateTimeField(default=timezone.now)
     creator = models.ForeignKey(User)
diff --git a/normandy/recipes/storage.py b/normandy/recipes/storage.py
deleted file mode 100644
index fe565280..00000000
--- a/normandy/recipes/storage.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import json
-
-from django.db import transaction
-
-from product_details.storage import PDDatabaseStorage
-
-
-class ProductDetailsRelationalStorage(PDDatabaseStorage):
-    """
-    Extends the in-database storage for product_details to provide a
-    database table of locales for other models to have foreign keys to.
-    """
-    @transaction.atomic
-    def update(self, name, content, last_modified):
-        # Don't import models when module loads due to app startup.
-        from normandy.recipes.models import Locale
-
-        super().update(name, content, last_modified)
-
-        # If we are updating firefox versions, update the table.
-        if name == 'languages.json':
-            languages = json.loads(content)
-            for locale_code, names in languages.items():
-                if locale_code == 'en-US':
-                    order = 0
-                else:
-                    order = 100
-
-                Locale.objects.update_or_create(code=locale_code, defaults={
-                    'english_name': names['English'],
-                    'native_name': names['native'],
-                    'order': order,
-                })
-
-            # Remove obsolete locales.
-            Locale.objects.exclude(code__in=languages.keys()).delete()
diff --git a/normandy/recipes/tests/__init__.py b/normandy/recipes/tests/__init__.py
index 8c00280d..f995741f 100644
--- a/normandy/recipes/tests/__init__.py
+++ b/normandy/recipes/tests/__init__.py
@@ -1,19 +1,12 @@
 import factory
 
-from django.template.defaultfilters import slugify
-from django.test import RequestFactory
-
 from normandy.base.tests import FuzzyUnicode, UserFactory
 from normandy.recipes.models import (
     Action,
     Approval,
     ApprovalRequest,
     ApprovalRequestComment,
-    Client,
-    Country,
-    Locale,
     Recipe,
-    ReleaseChannel,
 )
 
 
@@ -85,34 +78,6 @@ class ApprovalRequestCommentFactory(factory.DjangoModelFactory):
     creator = factory.SubFactory(UserFactory)
 
 
-class CountryFactory(factory.DjangoModelFactory):
-    class Meta:
-        model = Country
-
-    code = factory.fuzzy.FuzzyText(length=3)
-
-
-class LocaleFactory(factory.DjangoModelFactory):
-    class Meta:
-        model = Locale
-
-    code = factory.fuzzy.FuzzyText(length=2)
-
-
-class ReleaseChannelFactory(factory.DjangoModelFactory):
-    class Meta:
-        model = ReleaseChannel
-
-    name = FuzzyUnicode()
-    slug = factory.LazyAttribute(lambda o: slugify(o.name))
-
-
-class ClientFactory(factory.Factory):
-    class Meta:
-        model = Client
-
-    request = factory.LazyAttribute(lambda o: RequestFactory().get('/'))
-
 ARGUMENTS_SCHEMA = {
     "required": ["surveyId", "surveys"],
     "properties": {
diff --git a/normandy/settings.py b/normandy/settings.py
index bf218591..dbe5b2b6 100644
--- a/normandy/settings.py
+++ b/normandy/settings.py
@@ -15,7 +15,6 @@ class Core(Configuration):
         'normandy.health.apps.HealthApp',
         'normandy.recipes.apps.RecipesApp',
         'normandy.selfrepair',
-        'product_details',
         'rest_framework',
         'rest_framework.authtoken',
         'reversion',
@@ -162,7 +161,6 @@ class Base(Core):
     RAVEN_CONFIG = {
         'dsn': values.URLValue(None, environ_name='RAVEN_CONFIG_DSN'),
     }
-    PROD_DETAILS_STORAGE = values.Value('normandy.recipes.storage.ProductDetailsRelationalStorage')
     # statsd
     STATSD_HOST = values.Value('localhost')
     STATSD_PORT = values.IntegerValue(8125)
diff --git a/requirements.txt b/requirements.txt
index e20e0968..5f172034 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,9 +18,6 @@ django-countries==3.4.1 \
     --hash=sha256:23c6b5455a2e68ed02601cee0d3c80481965d0c3a6bd2f07ca56902b0a4c55a6
 django-dirtyfields==0.8.2 \
     --hash=sha256:90a60223a373ec563c0e6b013121a2d965233498384af0cf132b1622d0d8aa19
-django-mozilla-product-details==0.10 \
-    --hash=sha256:400e59be3c163aebfc8c078879e87a895dad249589d8bc332bb76dc9c9b63efb \
-    --hash=sha256:33add704683a5d7f9ff49c03e40a4d8c500882589aee970d5ed81ad11c7ae75c
 django-reversion==2.0.4 \
     --hash=sha256:a95624e28e72ef0b07231e601abe6fc790cd5e9e54791a1e57ff5eb2b1c0bc32
 django-sslserver==0.18 \

From 41b567c1cc45258b81c56863d16de617e447ae69 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 17 Aug 2016 17:24:34 +0000
Subject: [PATCH 72/74] Use mozlog format in production

Fixes bug 1273331
---
 normandy/settings.py | 35 +++++++++++++++++++++++++++++++++++
 requirements.txt     |  2 ++
 2 files changed, 37 insertions(+)

diff --git a/normandy/settings.py b/normandy/settings.py
index a3410360..f098dea8 100644
--- a/normandy/settings.py
+++ b/normandy/settings.py
@@ -148,6 +148,40 @@ class Base(Core):
         """
         return Core.MIDDLEWARE_CLASSES + self.EXTRA_MIDDLEWARE_CLASSES
 
+    LOGGING_USE_JSON = values.BooleanValue(False)
+
+    def LOGGING(self):
+        return {
+            'version': 1,
+            'disable_existing_loggers': True,
+            'formatters': {
+                'json': {
+                    '()': 'mozilla_cloud_services_logger.formatters.JsonLogFormatter',
+                    'logger_name': 'normandy',
+                },
+                'development': {
+                    'format': '%(levelname)s %(asctime)s %(name)s %(message)s',
+                }, },
+            'handlers': {
+                'console': {
+                    'level': 'DEBUG',
+                    'class': 'logging.StreamHandler',
+                    'formatter': 'json' if self.LOGGING_USE_JSON else 'development',
+                },
+            },
+            'root': {
+                'handlers': ['console'],
+                'level': 'WARNING',
+            },
+            'loggers': {
+                'normandy': {
+                    'propagate': False,
+                    'handlers': ['console'],
+                    'level': 'DEBUG',
+                },
+            },
+        }
+
     # Remote services
     DATABASES = values.DatabaseURLValue('postgres://postgres@localhost/normandy')
     GEOIP2_DATABASE = values.Value(os.path.join(Core.BASE_DIR, 'GeoLite2-Country.mmdb'))
@@ -239,6 +273,7 @@ class Production(Base):
     """Settings for the production environment."""
     USE_X_FORWARDED_HOST = values.BooleanValue(True)
     SECURE_PROXY_SSL_HEADER = values.TupleValue(('HTTP_X_FORWARDED_PROTO', 'https'))
+    LOGGING_USE_JSON = values.Value(True)
 
 
 class ProductionReadOnly(Production):
diff --git a/requirements.txt b/requirements.txt
index 5f172034..c6277003 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -178,3 +178,5 @@ click==6.6 \
 PyYAML==3.11 \
     --hash=sha256:c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 \
     --hash=sha256:19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9
+mozilla-cloud-services-logger==1.0.1 \
+    --hash=sha256:2a2a524f9d05bc5c8a6f3d13a28cb06386b0720cee00ba58e22b2de68089c6e4

From 55d62715414504d19581974067feb6884152d6e0 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 17 Aug 2016 19:22:48 +0000
Subject: [PATCH 73/74] Fix formatting typo

---
 normandy/settings.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/normandy/settings.py b/normandy/settings.py
index f098dea8..95d89637 100644
--- a/normandy/settings.py
+++ b/normandy/settings.py
@@ -161,7 +161,8 @@ class Base(Core):
                 },
                 'development': {
                     'format': '%(levelname)s %(asctime)s %(name)s %(message)s',
-                }, },
+                },
+            },
             'handlers': {
                 'console': {
                     'level': 'DEBUG',

From 24dd0105a7afbda64363be7fb091f72330ed53b9 Mon Sep 17 00:00:00 2001
From: Jesse McCarthy <git_commits@jessemccarthy.net>
Date: Thu, 18 Aug 2016 12:33:42 -0400
Subject: [PATCH 74/74] Delete babel dep

babel@6 doesn't do anything.
---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 8856216c..38777b13 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,6 @@
     "wolfy87-eventemitter": "4.3.0"
   },
   "devDependencies": {
-    "babel": "6.5.2",
     "babel-core": "6.11.4",
     "babel-eslint": "6.1.2",
     "babel-loader": "6.2.4",