From 8ceecd76a73c79ac368bac1057dd8c78b8f55c6d Mon Sep 17 00:00:00 2001
From: Andrew Musgrave <andrew.musgrave@shopify.com>
Date: Wed, 6 Mar 2019 11:57:53 -0500
Subject: [PATCH] changelog and add tests

---
 UNRELEASED.md                                 |  1 +
 .../FileUpload/tests/FileUpload.test.tsx      | 61 ++++++++++++++++---
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/UNRELEASED.md b/UNRELEASED.md
index b49b8c38c52..c5b0de9166c 100644
--- a/UNRELEASED.md
+++ b/UNRELEASED.md
@@ -20,6 +20,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f
 
 ### Bug fixes
 
+- Revert a change that constrained `DropZone` height based on inherited wrapper height [#1129](https://github.com/Shopify/polaris-react/pull/1129)
 - Fixed missing rounded corners on `Tag` button states ([#1078](https://github.com/Shopify/polaris-react/pull/1078))
 - Removed reference to `window.Polaris`, which in some cases could be undefined ([#1104](https://github.com/Shopify/polaris-react/issues/1104))
 - Added padding and margin to `subdued` sections for proper spacing between the header and footer ([#1082](https://github.com/Shopify/polaris-react/pull/1082))
diff --git a/src/components/DropZone/components/FileUpload/tests/FileUpload.test.tsx b/src/components/DropZone/components/FileUpload/tests/FileUpload.test.tsx
index f6143f07872..a9626b26133 100755
--- a/src/components/DropZone/components/FileUpload/tests/FileUpload.test.tsx
+++ b/src/components/DropZone/components/FileUpload/tests/FileUpload.test.tsx
@@ -3,18 +3,61 @@ import {Link, Icon, Button, Caption, TextStyle} from 'components';
 import {mountWithAppProvider} from 'test-utilities';
 import {Provider} from '../../Context';
 import FileUpload from '../FileUpload';
+import {fileUpload as fileUploadImage, imageUpload} from '../../../images';
 
 describe('<FileUpload />', () => {
-  it('renders large view', () => {
-    const fileUpload = mountWithAppProvider(
-      <Provider value={{size: 'large', type: 'file'}}>
-        <FileUpload />
-      </Provider>,
-    );
+  describe('extraLarge', () => {
+    it('renders extra large view for type file', () => {
+      const fileUpload = mountWithAppProvider(
+        <Provider value={{size: 'extraLarge', type: 'file'}}>
+          <FileUpload />
+        </Provider>,
+      );
+
+      expect(fileUpload.find('img').prop('src')).toBe(fileUploadImage);
+      expect(fileUpload.find(Button)).toHaveLength(1);
+      expect(fileUpload.find(TextStyle)).toHaveLength(1);
+    });
+
+    it('renders extra large view for type image', () => {
+      const fileUpload = mountWithAppProvider(
+        <Provider value={{size: 'extraLarge', type: 'image'}}>
+          <FileUpload />
+        </Provider>,
+      );
+
+      expect(fileUpload.find('img').prop('src')).toBe(imageUpload);
+      expect(fileUpload.find(Button)).toHaveLength(1);
+      expect(fileUpload.find(TextStyle)).toHaveLength(1);
+    });
+  });
+
+  describe('large', () => {
+    it('renders large view for type file', () => {
+      const fileUpload = mountWithAppProvider(
+        <Provider value={{size: 'large', type: 'file'}}>
+          <FileUpload />
+        </Provider>,
+      );
+
+      expect(fileUpload.find('img').prop('src')).toBe(fileUploadImage);
+      expect(fileUpload.find(Button)).toHaveLength(1);
+      expect(fileUpload.find(TextStyle)).toHaveLength(1);
+      expect(fileUpload.find(Caption)).toHaveLength(1);
+    });
+
+    it('renders large view for type image', () => {
+      const fileUpload = mountWithAppProvider(
+        <Provider value={{size: 'large', type: 'image'}}>
+          <FileUpload />
+        </Provider>,
+      );
 
-    expect(fileUpload.find('img')).toHaveLength(1);
-    expect(fileUpload.find(Button)).toHaveLength(1);
-    expect(fileUpload.find(TextStyle)).toHaveLength(1);
+      expect(fileUpload.find('img').prop('src')).toBe(imageUpload);
+      expect(fileUpload.find(Button)).toHaveLength(1);
+      expect(fileUpload.find(TextStyle)).toHaveLength(1);
+      expect(fileUpload.find(Caption)).toHaveLength(1);
+    });
   });
 
   it('renders medium view', () => {