From d312e1b428b38177ab14116f87a2a6e664ce79f4 Mon Sep 17 00:00:00 2001
From: amusso01 <eandram@hotmail.it>
Date: Tue, 13 Mar 2018 18:57:24 +0100
Subject: [PATCH] fix #2602 spinner loader

---
 web/client/components/shapefile/SelectShape.jsx           | 2 +-
 .../components/shapefile/__tests__/SelectShape-test.jsx   | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/client/components/shapefile/SelectShape.jsx b/web/client/components/shapefile/SelectShape.jsx
index 74d55e624c..1a0735edc6 100644
--- a/web/client/components/shapefile/SelectShape.jsx
+++ b/web/client/components/shapefile/SelectShape.jsx
@@ -40,7 +40,7 @@ class SelectShape extends React.Component {
 
     render() {
         return (
-            this.props.loading ? <div className="btn btn-info" style={{"float": "center"}}> <Spinner spinnerName="circle" overrideSpinnerClassName="spinner"/></div> :
+            this.props.loading ? <div className="btn btn-info" style={{"float": "center"}}> <Spinner spinnerName="circle" noFadeIn overrideSpinnerClassName="spinner"/></div> :
             <Dropzone rejectClassName="alert-danger" className="alert alert-info" onDrop={this.checkfile}>
               <div className="dropzone-content" style={{textAlign: "center"}}>{this.props.text}</div>
             </Dropzone>
diff --git a/web/client/components/shapefile/__tests__/SelectShape-test.jsx b/web/client/components/shapefile/__tests__/SelectShape-test.jsx
index d777072acf..82f94559b7 100644
--- a/web/client/components/shapefile/__tests__/SelectShape-test.jsx
+++ b/web/client/components/shapefile/__tests__/SelectShape-test.jsx
@@ -142,4 +142,12 @@ describe("Test the select shapefile component", () => {
         }];
         TestUtils.Simulate.drop(content, { dataTransfer: { files } });
     });
+
+    it('upload local vector, show loader', () => {
+        const cmp = ReactDOM.render(<SelectShape loading />, document.getElementById("container"));
+        expect(cmp).toExist();
+        const spinner = document.querySelector('.spinner');
+        /* check class sk-fade-in not present to ensure loader is not fade and correctly shown */
+        expect(spinner.className.indexOf('sk-fade-in')).toBe(-1);
+    });
 });