Merge branch 'master' into greenkeeper-punchcard-content-types-6.1.8

.travis.yml

@@ -11,28 +11,12 @@ sudo: true
 cache:
   directories:
     - node_modules
-    - $HOME/.yarn-cache
 services:
   - postgresql
 
-#########################
-## Install Yarn
-##
-## From https://yarnpkg.com/en/docs/install-ci#travis-tab
-#########################
-before_install:
-  # Repo for Yarn
-  - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
-  - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-  - sudo apt-get update -qq
-  - sudo apt-get install -y -qq yarn
-
-install: yarn
-
 before_script:
   - psql -c 'create database travis_ci_test;' -U postgres
-
-script: yarn test
+  - npm prune
 
 after_success:
   - npm run coverage

lib/routes/content.js

@@ -220,6 +220,7 @@ const routes = application => {
                 type: ct,
                 step,
                 config: config.content,
+                storage: config.storage,
               });
             });
           }).catch(e => {

lib/routes/data/styles.js

@@ -63,4 +63,8 @@ module.exports = {
       ],
     ],
   },
+  alertData: {
+    for: '00eef724-7cbd-47f5-a735-630510f39711',
+    value: 'Oops! The email or password you entered is incorrect. Please try again.',
+  },
 };

lib/storage/put.js

@@ -107,7 +107,7 @@ const fileDJ = file => {
       f.field = file.fieldName;
       f.type = file.type;
       f.path = `/${f.uuid}${path.extname(file.originalFilename)}`;
-      f.rel = `${f.uuid}${path.extname(file.originalFilename)}`;
+      f.rel = `/${f.uuid}${path.extname(file.originalFilename)}`;
       f.original = file.originalFilename;
 
       res(f);
@@ -124,9 +124,10 @@ const fileDJ = file => {
  */
 const value = file => {
   const storable = {};
+
   storable.type = _.get(file, 'type', '');
   storable.original = _.get(file, 'original', '');
-  storable.relative = _.get(file, 'path', '');
+  storable.relative = _.get(file, 'rel', '');
 
   return storable;
 };

tests/storage.js

@@ -2,6 +2,7 @@ import test from 'ava';
 import del from 'del';
 import _ from 'lodash';
 import fs from 'fs';
+import path from 'path';
 import storage from '../lib/storage';
 import fixtures from './fixtures/files';
 
@@ -26,7 +27,7 @@ test('Storage - Default', t => {
       t.true(result.hasOwnProperty('relative'), 'Has a relative path');
       t.is(result.type, expected.type, 'Have the same type');
 
-      const output = fs.readFileSync(result.relative);
+      const output = fs.readFileSync(path.join(__dirname, 'public/files', result.relative));
       const original = fs.readFileSync(expected.path);
 
       t.is(output.toString(), original.toString(), 'Output and original are the same file');

views/components/alert.html

@@ -1,3 +1,3 @@
-{% macro alert(for, type, value) %}
-<p class="alert--{{type | upper}}" role="alert" for="{{for}}">{{value}}</p>
+{% macro alert(data) %}
+<p class="form--alert" role="alert" for="{{data.for}}">{{data.value}}</p>
 {% endmacro %}

views/styles.html

@@ -328,6 +328,12 @@ <h1 class="base--h2">Form elements</h1>
     </form>
   </section>
 
+  <section class="_style-guide--group">
+    <h2 class="_style-guide--title">Alerts</h2>
+    {% from "components/alert.html" import alert %}
+    {{alert(alertData)}}
+  </section>
+
   <section class="_style-guide--group">
     <h2 class="_style-guide--title">Tabular Data</h2>
     {% from "components/table.html" import table %}