From 1baef21340d26197840e88e77f3e1173979b17b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedikt=20R=C3=B6tsch?= <benedikt@contentful.com>
Date: Wed, 7 Mar 2018 14:02:14 +0100
Subject: [PATCH] fix(empty-states): properly render empty content warning and
 add e2e test config

---
 test/e2e-variables.env                    | 3 +++
 test/run-e2e-test.js                      | 6 +++++-
 views/landingPage.pug                     | 2 +-
 views/mixins/_lesson.pug                  | 3 +--
 views/mixins/_moduleHighlightedCourse.pug | 1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/e2e-variables.env b/test/e2e-variables.env
index 7bee1fb..1677793 100644
--- a/test/e2e-variables.env
+++ b/test/e2e-variables.env
@@ -7,4 +7,7 @@ CONTENTFUL_PREVIEW_API_HOST=preview.contentful.com
 CONTENTFUL_QA_SPACE_ID=jnzexv31feqf
 CONTENTFUL_QA_DELIVERY_TOKEN=7c1c321a528a25c351c1ac5f53e6ddc6bcce0712ecebec60817f53b35dd3c42b
 CONTENTFUL_QA_PREVIEW_TOKEN=4310226db935f0e9b6b34fb9ce6611e2061abe1aab5297fa25bd52af5caa531a
+CONTENTFUL_QA_EMPTY_STATES_SPACE_ID=85si70kq8sjj
+CONTENTFUL_QA_EMPTY_STATES_DELIVERY_TOKEN=eecf609f1411e10439f95c7d89a86c2661476bc3f92f8f0ead0e303e8e4ce9f9
+CONTENTFUL_QA_EMPTY_STATES_PREVIEW_TOKEN=f9d927308234f773f90be351e72010fa6ca8f0e36b94cb3cc0f84a40c43f2e4d
 PORT=3007
diff --git a/test/run-e2e-test.js b/test/run-e2e-test.js
index a809db1..a432ad6 100644
--- a/test/run-e2e-test.js
+++ b/test/run-e2e-test.js
@@ -10,6 +10,7 @@ const app = require('../app')
 const {
   CONTENTFUL_SPACE_ID, CONTENTFUL_DELIVERY_TOKEN, CONTENTFUL_PREVIEW_TOKEN,
   CONTENTFUL_QA_SPACE_ID, CONTENTFUL_QA_DELIVERY_TOKEN, CONTENTFUL_QA_PREVIEW_TOKEN,
+  CONTENTFUL_QA_EMPTY_STATES_SPACE_ID, CONTENTFUL_QA_EMPTY_STATES_DELIVERY_TOKEN, CONTENTFUL_QA_EMPTY_STATES_PREVIEW_TOKEN,
   PORT
 } = process.env
 
@@ -31,7 +32,10 @@ server.listen(TEST_PORT, function () {
     `CONTENTFUL_PREVIEW_TOKEN=${CONTENTFUL_PREVIEW_TOKEN}`,
     `CONTENTFUL_QA_SPACE_ID=${CONTENTFUL_QA_SPACE_ID}`,
     `CONTENTFUL_QA_DELIVERY_TOKEN=${CONTENTFUL_QA_DELIVERY_TOKEN}`,
-    `CONTENTFUL_QA_PREVIEW_TOKEN=${CONTENTFUL_QA_PREVIEW_TOKEN}`
+    `CONTENTFUL_QA_PREVIEW_TOKEN=${CONTENTFUL_QA_PREVIEW_TOKEN}`,
+    `CONTENTFUL_QA_EMPTY_STATES_SPACE_ID=${CONTENTFUL_QA_EMPTY_STATES_SPACE_ID}`,
+    `CONTENTFUL_QA_EMPTY_STATES_DELIVERY_TOKEN=${CONTENTFUL_QA_EMPTY_STATES_DELIVERY_TOKEN}`,
+    `CONTENTFUL_QA_EMPTY_STATES_PREVIEW_TOKEN=${CONTENTFUL_QA_EMPTY_STATES_PREVIEW_TOKEN}`
   ]
   let command = [
     'run',
diff --git a/views/landingPage.pug b/views/landingPage.pug
index 7d5e0e6..d903511 100644
--- a/views/landingPage.pug
+++ b/views/landingPage.pug
@@ -14,7 +14,7 @@ block content
   .layout-centered
     +editorialFeatures(landingPage)
   .modules-container
-    if landingPage.fields.contentModules.length
+    if landingPage.fields.contentModules && landingPage.fields.contentModules.length
       each module in landingPage.fields.contentModules
         case module.sys.contentType.sys.id
           when 'layoutCopy'
diff --git a/views/mixins/_lesson.pug b/views/mixins/_lesson.pug
index 92e914c..fb664b2 100644
--- a/views/mixins/_lesson.pug
+++ b/views/mixins/_lesson.pug
@@ -9,7 +9,7 @@ mixin lesson(lesson, course, nextLesson)
     h1.lesson__title #{lesson.fields.title}
     +editorialFeatures(lesson)
     .lesson__modules
-      if lesson.fields.modules.length
+      if lesson.fields.modules && lesson.fields.modules.length
         each module in lesson.fields.modules
           if module.sys.contentType
             case module.sys.contentType.sys.id
@@ -28,4 +28,3 @@ mixin lesson(lesson, course, nextLesson)
         +emptyModule()
     if nextLesson
       a.lesson__cta.cta(href=`/courses/${course.fields.slug}/lessons/${nextLesson.fields.slug}${queryString}`) #{translate('nextLessonLabel', currentLocale.code)}
-
diff --git a/views/mixins/_moduleHighlightedCourse.pug b/views/mixins/_moduleHighlightedCourse.pug
index 27ebf23..b429c73 100644
--- a/views/mixins/_moduleHighlightedCourse.pug
+++ b/views/mixins/_moduleHighlightedCourse.pug
@@ -4,6 +4,7 @@ mixin moduleHighlightedCourse(module, course)
   .module.module-highlighted-course
     if(!course)
       .module-highlighted-course__wrapper
+      .module-highlighted-course__overlay
         .module-highlighted-course__content
           h2.module-highlighted-course__title #{translate('errorHighlightedCourse', currentLocale.code)}
     else