makersacademy · gimi-q · Feb 1, 2016 · Mar 7, 2016 · Mar 7, 2016 · houndci-bot
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+bower_components
+node_modules
diff --git a/bower.json b/bower.json
@@ -0,0 +1,25 @@
+{
+  "name": "todo_list_week8_challenge_ma",
+  "description": "",
+  "main": "",
+  "moduleType": [],
+  "license": "MIT",
+  "homepage": "",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": "^2.2.0",
+    "bootstrap": "^3.3.6",
+    "angular": "^1.4.9",
+    "angular-resource": "^1.4.9"
+  },
+  "devDependencies": {
+    "angular-mocks": "^1.4.9",
+    "angular-route": "^1.4.9"
+  }
+}
diff --git a/index.html b/index.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<html lang="en" ng-app="toDoList">
+  <head>
+    <meta charset="utf-8">
+    <title>To Do List</title>
+    <link href="bower_components/bootstrap/dist/css/bootstrap.css" rel="stylesheet">
+    <script src="bower_components/jquery/dist/jquery.js"></script>
+    <script src="bower_components/angular/angular.js"></script>
+    <script src="bower_components/angular-resource/angular-resource.js"></script>
+    <script src="js/app.js"></script>
+    <script src="js/toDoListController.js"></script>
+  </head>
+
+  <body ng-controller="toDoListController as toDoListCtrl">
+    <h1>What Needs To Be Done?</h1>
+    <section>
+
+      <form>
+        <label for="newToDo">New ToDo:</label>
+        <input class="form-control" id="newToDo" ng-model="toDoListCtrl.addTask" type="text">
+        <input class="btn btn-primary submit" id="newTask" ng-click="toDoListCtrl.newTask()" type="submit" value="submit">
+      </form>
+    </section>
+    <ul class="list-group">
+      <li ng-repeat="task in toDoListCtrl.tasks">
+
+        <p>
+          <span><input type="checkbox" value=""></span>{{task}}
+          <span class="pull-right">
+            <button class="btn btn-xs btn-info" ng-click="this.value='Complete'">Active</button>
+            <button class="btn btn-xs btn-info">Edit</button>
+            <button class="btn btn-xs btn-warning" ng-click="toDoListCtrl.remove(item)">
+              <span class="glyphicon glyphicon-trash"></span>
+            </button>
+          </span>
+        </p>
+      </li>
+    </ul>
+    <div></div>
+    <div class="btn-group">
+      <button class="btn btn-primary" type="button">All</button>
+      <button class="btn btn-primary" type="button">Active</button>
+      <button class="btn btn-primary" type="button">Complete</button>
+      <button class="btn btn-primary" type="button">Clear All</button>
+    </div>
+  </body>
+</html>
diff --git a/js/app.js b/js/app.js
@@ -0,0 +1 @@
+var toDoList = angular.module('toDoList', ['ngResource']);
diff --git a/js/toDoListController.js b/js/toDoListController.js
@@ -0,0 +1,19 @@
+toDoList.controller('toDoListController', [function() {
+
+  var self = this;
+
+  self.tasks = [
+
+  ]
+
+  self.newTask = function() {
+    self.tasks.push(self.addTask);
+  };
+
+  self.remove = function(item) {
+    var index = self.tasks.indexOf(item);
+    self.tasks.splice(index, 1);
+  }
+
+
+}]);
diff --git a/package.json b/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "todo_challenge",
+  "version": "1.0.0",
+  "description": "* Deadline: submit completed pull request by 9am on Monday * You may use whatever level of JavaScript you feel comfortable with - pure JS, jQuery, Angular, or whatever weird and wonderful framework you want to try. Extra points for DogeScript",
+  "main": "index.js",
+  "directories": {
+    "doc": "docs"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/gimi-q/todo_challenge.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/gimi-q/todo_challenge/issues"
+  },
+  "homepage": "https://github.com/gimi-q/todo_challenge#readme",
+  "devDependencies": {
+    "protractor": "^3.0.0"
+  }
+}
diff --git a/test/e2e/conf.js b/test/e2e/conf.js
@@ -0,0 +1,5 @@
+exports.config = {
+  seleniumAddress: 'http://localhost:4444/wd/hub',
+  baseUrl: 'http://localhost:8081',
+  specs: ['toDoListFeature.js']
+}
diff --git a/test/e2e/toDoListFeature.js b/test/e2e/toDoListFeature.js
@@ -0,0 +1,26 @@
+describe('To Do List', function() {
+  it('has a title', function() {
+    browser.get('http://localhost:8081');
+
+    expect(browser.getTitle()).toEqual('To Do List');
+  });
+
+  it('add tasks', function() {
+
+    element(by.model('toDoListCtrl.addTask')).sendKeys('Walk Cat');
+    element(by.id('newTask')).click();
+
+    expect(element(by.binding('task')).getText()).
+    toContain('Walk Cat');
+  });
+
+  xit('can delete tasks', function() {
+
+    element(by.model('toDoListCtrl.addTask')).sendKeys('Walk Cat');
+    element(by.id('newTask')).click();
+    element(by.id('deleteTask')).click();
+
+    expect(element(by.binding('task')).getText()).
+    toContain('Walk Cat');
+  });
+});
diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -0,0 +1,68 @@
+// Karma configuration
+// Generated on Thu Nov 27 2014 10:43:21 GMT+0000 (GMT)
+
+module.exports = function(config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '../',
+
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['jasmine'],
+
+
+    // list of files / patterns to load in the browser
+    files: [
+      'bower_components/angular/angular.js',
+      'bower_components/angular-route/angular-route.js',
+      'bower_components/angular-resource/angular-resource.js',
+      'bower_components/angular-mocks/angular-mocks.js',
+      'js/**/*.js',
+      'test/**/*.spec.js'
+    ],
+
+
+    // list of files to exclude
+    exclude: [],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {},
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['PhantomJS'],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: false
+  });
+};
diff --git a/test/toDoListController.spec.js b/test/toDoListController.spec.js
@@ -0,0 +1,33 @@
+describe('toDoListController', function() {
+  beforeEach(module('toDoList'));
+
+  var ctrl;
+
+  beforeEach(inject(function($controller) {
+    ctrl = $controller('toDoListController');
+  }));
+
+  it('initialises with an empty to do input field', function() {
+    expect(ctrl.toDoListInput).toBeUndefined();
+
+  });
+
+  describe('when adding a to do task', function() {
+
+  var tasks =
+    {
+      "task": "Walk Dog"
+
+    }
+
+
+
+  it('displays the new to do task', function() {
+    ctrl.addTask = 'Walk Dog'
+    ctrl.newTask();
+    expect(ctrl.tasks).toEqual(tasks);
+  });
+});
+
+
+});
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		var toDoList = angular.module('toDoList', ['ngResource']);
Copy link houndci-bot Feb 1, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. 'angular' is not defined.