Add latest changes from gitlab-org/gitlab@master

1 files changed, 50 insertions, 36 deletions

diff --git a/spec/javascripts/dropzone_input_spec.js b/spec/javascripts/dropzone_input_spec.js
index ef899612b08..125dcdb3763 100644
--- a/spec/javascripts/dropzone_input_spec.js
+++ b/spec/javascripts/dropzone_input_spec.js
@@ -13,54 +13,68 @@ const TEMPLATE = `<form class="gfm-form" data-uploads-path="${TEST_UPLOAD_PATH}"
 </form>`;
 
 describe('dropzone_input', () => {
-  let form;
-  let dropzone;
-  let xhr;
-  let oldXMLHttpRequest;
+  it('returns null when failed to initialize', () => {
+    const dropzone = dropzoneInput($('<form class="gfm-form"></form>'));
 
-  beforeEach(() => {
-    form = $(TEMPLATE);
+    expect(dropzone).toBeNull();
+  });
 
-    dropzone = dropzoneInput(form);
+  it('returns valid dropzone when successfully initialize', () => {
+    const dropzone = dropzoneInput($(TEMPLATE));
 
-    xhr = jasmine.createSpyObj(Object.keys(XMLHttpRequest.prototype));
-    oldXMLHttpRequest = window.XMLHttpRequest;
-    window.XMLHttpRequest = () => xhr;
+    expect(dropzone.version).toBeTruthy();
   });
 
-  afterEach(() => {
-    window.XMLHttpRequest = oldXMLHttpRequest;
-  });
+  describe('shows error message', () => {
+    let form;
+    let dropzone;
+    let xhr;
+    let oldXMLHttpRequest;
 
-  it('shows error message, when AJAX fails with json', () => {
-    xhr = {
-      ...xhr,
-      statusCode: 400,
-      readyState: 4,
-      responseText: JSON.stringify({ message: TEST_ERROR_MESSAGE }),
-      getResponseHeader: () => 'application/json',
-    };
+    beforeEach(() => {
+      form = $(TEMPLATE);
 
-    dropzone.processFile(TEST_FILE);
+      dropzone = dropzoneInput(form);
 
-    xhr.onload();
+      xhr = jasmine.createSpyObj(Object.keys(XMLHttpRequest.prototype));
+      oldXMLHttpRequest = window.XMLHttpRequest;
+      window.XMLHttpRequest = () => xhr;
+    });
 
-    expect(form.find('.uploading-error-message').text()).toEqual(TEST_ERROR_MESSAGE);
-  });
+    afterEach(() => {
+      window.XMLHttpRequest = oldXMLHttpRequest;
+    });
+
+    it('when AJAX fails with json', () => {
+      xhr = {
+        ...xhr,
+        statusCode: 400,
+        readyState: 4,
+        responseText: JSON.stringify({ message: TEST_ERROR_MESSAGE }),
+        getResponseHeader: () => 'application/json',
+      };
+
+      dropzone.processFile(TEST_FILE);
+
+      xhr.onload();
+
+      expect(form.find('.uploading-error-message').text()).toEqual(TEST_ERROR_MESSAGE);
+    });
 
-  it('shows error message, when AJAX fails with text', () => {
-    xhr = {
-      ...xhr,
-      statusCode: 400,
-      readyState: 4,
-      responseText: TEST_ERROR_MESSAGE,
-      getResponseHeader: () => 'text/plain',
-    };
+    it('when AJAX fails with text', () => {
+      xhr = {
+        ...xhr,
+        statusCode: 400,
+        readyState: 4,
+        responseText: TEST_ERROR_MESSAGE,
+        getResponseHeader: () => 'text/plain',
+      };
 
-    dropzone.processFile(TEST_FILE);
+      dropzone.processFile(TEST_FILE);
 
-    xhr.onload();
+      xhr.onload();
 
-    expect(form.find('.uploading-error-message').text()).toEqual(TEST_ERROR_MESSAGE);
+      expect(form.find('.uploading-error-message').text()).toEqual(TEST_ERROR_MESSAGE);
+    });
   });
 });