Merge branch 're-write' of https://github.com/kiswa/TaskBoard into re-write

README.md

@@ -163,9 +163,9 @@ Command: `cloc --exclude-dir=vendor --exclude-ext=json src/`
 
 Language     |  Files |    Blank | Comment |     Code
 -------------|-------:|---------:|--------:|---------:
-JavaScript   |     44 |      529 |      51 |     2141
+JavaScript   |     44 |      537 |      51 |     2165
 PHP          |     10 |      688 |      16 |     2014
-__SUM:__     | __54__ | __1217__ |  __67__ | __4155__
+__SUM:__     | __54__ | __1225__ |  __67__ | __4179__
 
 Command: `cloc --exclude-ext=xml test/`
 

src/scss/_icons.scss

@@ -42,7 +42,7 @@
 .icon-resize-vertical::before { content: '\e811'; }
 .icon-minus-squared-alt::before { content: '\f147'; }
 .icon-plus-squared-alt::before { content: '\f196'; }
-.icon-hashtag:before { content: '\f292'; }
+.icon-hashtag::before { content: '\f292'; }
 
 .icon-check::before {
     content: '\e812';

test/app/settings/settings.service.spec.js

@@ -56,5 +56,22 @@ describe('UserAdminService', () => {
 
         settingsService.updateBoards([]);
     });
+
+    it('allows updating actions and notifies subscribers', done => {
+        var first = true;
+
+        settingsService.actionsChanged.subscribe(actions => {
+            expect(actions).to.be.an('array');
+
+            if (first) {
+                first = false;
+                return;
+            }
+
+            done();
+        });
+
+        settingsService.updateActions([]);
+    });
 });
 

test/app/shared/inline-edit/inline-edit.component.spec.js

@@ -36,7 +36,7 @@ describe('InlineEdit', () => {
             done();
         });
 
-        inlineEdit.editDone('test');
+        inlineEdit.editDone('test', { stopPropagation: () => {} });
     });
 });
 

test/app/shared/models/column.model.spec.js

@@ -33,5 +33,10 @@ describe('ApiResponse', () => {
         expect(column.tasks).to.be.an('array');
         expect(column.tasks.length).to.equal(0);
     });
+
+    it('has a method to check for task limit', () => {
+        expect(column.hasTaskLimit).to.be.a('function');
+        expect(column.hasTaskLimit()).to.equal(false);
+    });
 });
 

test/app/shared/models/user.model.spec.js

@@ -30,7 +30,7 @@ describe('User', () => {
 
     it('has security_level', () => {
         expect(user.security_level).to.be.a('number');
-        expect(user.security_level).to.equal(3);
+        expect(user.security_level).to.equal(4);
     });
 
     it('has user_option_id', () => {
@@ -42,5 +42,15 @@ describe('User', () => {
         expect(user.username).to.be.a('string');
         expect(user.username).to.equal('');
     });
+
+    it('has a method to check for admin', () => {
+        expect(user.isAdmin).to.be.a('function');
+        expect(user.isAdmin()).to.equal(false);
+    });
+
+    it('has a method to check for board admin', () => {
+        expect(user.isBoardAdmin).to.be.a('function');
+        expect(user.isBoardAdmin()).to.equal(false);
+    });
 });