From 99c0be88f4b9c754a31542391409ed84bf0eb6b9 Mon Sep 17 00:00:00 2001 From: Jon Jarboe Date: Fri, 8 Apr 2016 14:28:57 -0500 Subject: [PATCH 1/2] Remote dummy tasks to make space for user-added ones --- .../apps/admin-dashboard/app/data/dashboard/Tasks.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Workspace/apps/admin-dashboard/app/data/dashboard/Tasks.js b/Workspace/apps/admin-dashboard/app/data/dashboard/Tasks.js index 2207385..c2b0a37 100644 --- a/Workspace/apps/admin-dashboard/app/data/dashboard/Tasks.js +++ b/Workspace/apps/admin-dashboard/app/data/dashboard/Tasks.js @@ -16,16 +16,6 @@ Ext.define('Admin.data.dashboard.Tasks', { "id": 3, "task": "Upgrade to SSD harddisks", "done": false - }, - { - "id": 4, - "task": "Pay server invoice", - "done": false - }, - { - "id": 5, - "task": "Upgrade to SSD harddisks", - "done": false } ] }); From bdda3ae714068225e950a93ee639d5196727c56e Mon Sep 17 00:00:00 2001 From: Jon Jarboe Date: Fri, 8 Apr 2016 16:21:05 -0500 Subject: [PATCH 2/2] state after developer testing video --- .../app/view/dashboard/DashboardController.js | 8 ++++++ .../classic/src/view/dashboard/Todos.js | 4 +++ .../apps/admin-dashboard/test/project.json | 13 +++++++++- .../admin-dashboard/test/todo/New todo.js | 26 +++++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Workspace/apps/admin-dashboard/test/todo/New todo.js diff --git a/Workspace/apps/admin-dashboard/app/view/dashboard/DashboardController.js b/Workspace/apps/admin-dashboard/app/view/dashboard/DashboardController.js index a49784c..cd35e0c 100644 --- a/Workspace/apps/admin-dashboard/app/view/dashboard/DashboardController.js +++ b/Workspace/apps/admin-dashboard/app/view/dashboard/DashboardController.js @@ -34,6 +34,14 @@ Ext.define('Admin.view.dashboard.DashboardController', { tool.toggleValue = !tool.toggleValue; }, + onAddTodo : function() { + var store = this.getStore('todos'); + var task = Ext.getCmp('new-task-text'); + var newTask = task.getValue(); + store.add( { task: newTask } ); + task.setValue(''); + }, + clearChartUpdates : function() { this.chartTaskRunner = Ext.destroy(this.chartTaskRunner); }, diff --git a/Workspace/apps/admin-dashboard/classic/src/view/dashboard/Todos.js b/Workspace/apps/admin-dashboard/classic/src/view/dashboard/Todos.js index c68f1bc..40eaafe 100644 --- a/Workspace/apps/admin-dashboard/classic/src/view/dashboard/Todos.js +++ b/Workspace/apps/admin-dashboard/classic/src/view/dashboard/Todos.js @@ -47,6 +47,7 @@ Ext.define('Admin.view.dashboard.Todos', { xtype: 'textfield', flex: 1, fieldLabel: 'Add Task', + id: 'new-task-text', hideLabel: true, width:540, emptyText: 'Add New Task' @@ -55,6 +56,9 @@ Ext.define('Admin.view.dashboard.Todos', { xtype: 'button', ui: 'soft-green', width: 40, + listeners: { + click: 'onAddTodo' + }, iconCls: 'x-fa fa-plus', margin:'0 0 0 10' } diff --git a/Workspace/apps/admin-dashboard/test/project.json b/Workspace/apps/admin-dashboard/test/project.json index 8ef6ca3..1ab2e5b 100644 --- a/Workspace/apps/admin-dashboard/test/project.json +++ b/Workspace/apps/admin-dashboard/test/project.json @@ -8,7 +8,9 @@ "coverageFilters": [], "directory": "unit", "name": "Unit Tests", - "profile": "classic" + "profile": "classic", + "launch": false, + "page": "" }, { "libs": [], @@ -18,6 +20,15 @@ "page": "#email", "launch": true, "profile": "classic" + }, + { + "libs": [], + "coverageFilters": [], + "launch": true, + "directory": "todo", + "name": "Todo", + "page": "", + "profile": "classic" } ], "globals": "Admin" diff --git a/Workspace/apps/admin-dashboard/test/todo/New todo.js b/Workspace/apps/admin-dashboard/test/todo/New todo.js new file mode 100644 index 0000000..8e03a86 --- /dev/null +++ b/Workspace/apps/admin-dashboard/test/todo/New todo.js @@ -0,0 +1,26 @@ +describe("New todo", function() { + it("should pass", function() { + expect(1).toBe(1); + }); + it('should appear in list', function() { + ST.play([ + { type: "tap", target: "@new-task-text-inputEl", x: 41, y: 8 }, + { type: "keydown", target: "@new-task-text-inputEl", key: "Shift", shiftKey: true }, + { type: "keydown", target: "@new-task-text-inputEl", key: "T", shiftKey: true }, + { type: "keyup", target: "@new-task-text-inputEl", key: "T", shiftKey: true }, + { type: "keyup", target: "@new-task-text-inputEl", key: "Shift" }, + { type: "type", target: "@new-task-text-inputEl", text: "est new functionality" }, + { type: "tap", target: "@button-1080-btnIconEl", x: 12, y: -1 }, + { fn: function(done) { + expect(this.targetEl.dom.innerHTML).toBe('Test new functionality'); + done(); + }, target: "@tableview-1078-record-95/tbody/tr/td[2]/div", x: 250, y: 17 } + ]); + + }); + it('should clear new task field', function() { + var fld = ST.find('#new-task-text => input'); + expect(fld.value.length).toBe(0); + }); +}); +