Merge pull request #9 from unicef-polymer/develop

Develop
unicef-polymer · Oct 25, 2017 · 98876c6 · 98876c6
2 parents 08e073c + 3f8b764
commit 98876c6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,13 +1,14 @@
 {
   "name": "etools-loading",
   "description": "loading spinner",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "license": "https://github.com/unicef-polymer/etools-loading/blob/master/LICENSE.md",
   "main": "etools-loading.html",
   "dependencies": {
     "polymer": "Polymer/polymer#^1.4.0",
     "paper-spinner": "PolymerElements/paper-spinner#^1.2.0",
-    "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.3.1"
+    "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.3.1",
+    "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.4.1"
   },
   "devDependencies": {
     "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",

diff --git a/test/etools-loading_test.html b/test/etools-loading_test.html
@@ -20,12 +20,18 @@
 
     <script>
       suite('etools-loading', function() {
-
-        test('instantiating the element works', function() {
-          var element = fixture('basic');
-          assert.equal(element.is, 'etools-loading');
+        let basic;
+        setup(() => {
+          basic = fixture('basic');
         });
-
+        test('instantiating the element works', () => {
+          assert.equal(basic.is, 'etools-loading');
+        });
+        test('displays when instantiated with active property', () => {
+          basic.setAttribute('active', true)
+          expect(basic.style.display).to.equal('flex')
+          expect(basic.style.display).to.not.equal('none')
+        })
       });
     </script>
   </body>