From 906d062416dcfe09c972d28574e7a7bac30244d5 Mon Sep 17 00:00:00 2001 From: Khalid Mohamud Date: Mon, 13 Feb 2017 14:16:14 -0800 Subject: [PATCH 1/3] finished lab --- lab-khalid/index.js | 5 +++++ lab-khalid/lib/greet.js | 8 ++++++++ lab-khalid/test/greeting-test.js | 12 ++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 lab-khalid/index.js create mode 100644 lab-khalid/lib/greet.js create mode 100644 lab-khalid/test/greeting-test.js diff --git a/lab-khalid/index.js b/lab-khalid/index.js new file mode 100644 index 0000000..947e8b2 --- /dev/null +++ b/lab-khalid/index.js @@ -0,0 +1,5 @@ +'use strict'; + +const greeting = require('../lab-khalid/lib/greet.js'); +console.log('working') +greeting.hello() diff --git a/lab-khalid/lib/greet.js b/lab-khalid/lib/greet.js new file mode 100644 index 0000000..22d7791 --- /dev/null +++ b/lab-khalid/lib/greet.js @@ -0,0 +1,8 @@ +'use strict'; + +module.exports = exports = {}; + +exports.hello = function(name) { + if(arguments.length === 0) throw new Error('Name not received'); + return `Hello, ${name}!`; +} diff --git a/lab-khalid/test/greeting-test.js b/lab-khalid/test/greeting-test.js new file mode 100644 index 0000000..bd2b6e7 --- /dev/null +++ b/lab-khalid/test/greeting-test.js @@ -0,0 +1,12 @@ +'use strict'; + +const greeting = require('../lib/greet.js'); +const assert = require('assert'); +describe('Greeting module', function() { + describe('#hello', function(){ + it('should return hello khalid', function() { + const result = greeting.hello('khalid'); + assert.ok(result === 'Hello, khalid!', 'Not equal to Hello khalid!'); + }); + }); +}); From 035152d4abb3d80133db34318b25491b10e0bfe8 Mon Sep 17 00:00:00 2001 From: Khalid Mohamud Date: Mon, 13 Feb 2017 15:13:32 -0800 Subject: [PATCH 2/3] added bonus --- lab-khalid/index.js | 2 +- lab-khalid/lib/greet.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lab-khalid/index.js b/lab-khalid/index.js index 947e8b2..6d5d385 100644 --- a/lab-khalid/index.js +++ b/lab-khalid/index.js @@ -2,4 +2,4 @@ const greeting = require('../lab-khalid/lib/greet.js'); console.log('working') -greeting.hello() +greeting.hello(process.argv[2]) diff --git a/lab-khalid/lib/greet.js b/lab-khalid/lib/greet.js index 22d7791..c2c0998 100644 --- a/lab-khalid/lib/greet.js +++ b/lab-khalid/lib/greet.js @@ -4,5 +4,6 @@ module.exports = exports = {}; exports.hello = function(name) { if(arguments.length === 0) throw new Error('Name not received'); + console.log(name); return `Hello, ${name}!`; } From 79bb84b2b0b901d91c7fe5feb5118245a24a3935 Mon Sep 17 00:00:00 2001 From: Khalid Mohamud Date: Tue, 14 Feb 2017 14:01:07 -0800 Subject: [PATCH 3/3] finished lab 02 --- lab-khalid/.eslintrc | 21 +++++ lab-khalid/.gitignore | 127 +++++++++++++++++++++++++++++++ lab-khalid/gulpfile.js | 20 +++++ lab-khalid/index.js | 4 +- lab-khalid/lib/greet.js | 2 +- lab-khalid/package.json | 21 +++++ lab-khalid/test/greeting-test.js | 6 +- 7 files changed, 196 insertions(+), 5 deletions(-) create mode 100644 lab-khalid/.eslintrc create mode 100644 lab-khalid/.gitignore create mode 100644 lab-khalid/gulpfile.js create mode 100644 lab-khalid/package.json diff --git a/lab-khalid/.eslintrc b/lab-khalid/.eslintrc new file mode 100644 index 0000000..8dc6807 --- /dev/null +++ b/lab-khalid/.eslintrc @@ -0,0 +1,21 @@ +{ + "rules": { + "no-console": "off", + "indent": [ "error", 2 ], + "quotes": [ "error", "single" ], + "semi": ["error", "always"], + "linebreak-style": [ "error", "unix" ] + }, + "env": { + "es6": true, + "node": true, + "mocha": true, + "jasmine": true + }, + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + }, + "extends": "eslint:recommended" +} diff --git a/lab-khalid/.gitignore b/lab-khalid/.gitignore new file mode 100644 index 0000000..46e5ad0 --- /dev/null +++ b/lab-khalid/.gitignore @@ -0,0 +1,127 @@ +# Created by https://www.gitignore.io/api/node,vim,macos,linux,windows + +node_modules/ + +### Node ### +# Logs +logs +*.log +npm-debug.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules +jspm_packages + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + + + +### Vim ### +# swap +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] +# session +Session.vim +# temporary +.netrwhist +*~ +# auto-generated tag files +tags + + +### macOS ### +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon +# Thumbnails +._* +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + + +### Linux ### + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + + +### Windows ### +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk diff --git a/lab-khalid/gulpfile.js b/lab-khalid/gulpfile.js new file mode 100644 index 0000000..b32c43f --- /dev/null +++ b/lab-khalid/gulpfile.js @@ -0,0 +1,20 @@ +'use strict'; + +const gulp = require('gulp'); +const mocha = require('gulp-mocha'); +const eslint = require('gulp-eslint'); + +gulp.task('test', function(){ + gulp.src('./test/*-test.js', {read:false}) + .pipe(mocha({reporter:'spec'})); +}); +gulp.task('lint', function() { + return gulp.src(['**/*.js', '!node_modules/**']) + .pipe(eslint()) + .pipe(eslint.format()) + .pipe(eslint.failAfterError()); +}); +gulp.task('dev', function() { + gulp.watch(['**/*.js', '!node_module'], ['test', 'lint']); +}); +gulp.task('default', ['dev']); diff --git a/lab-khalid/index.js b/lab-khalid/index.js index 6d5d385..ad8a3df 100644 --- a/lab-khalid/index.js +++ b/lab-khalid/index.js @@ -1,5 +1,5 @@ 'use strict'; const greeting = require('../lab-khalid/lib/greet.js'); -console.log('working') -greeting.hello(process.argv[2]) +console.log('working'); +greeting.hello(process.argv[2]); diff --git a/lab-khalid/lib/greet.js b/lab-khalid/lib/greet.js index c2c0998..5c5bfff 100644 --- a/lab-khalid/lib/greet.js +++ b/lab-khalid/lib/greet.js @@ -6,4 +6,4 @@ exports.hello = function(name) { if(arguments.length === 0) throw new Error('Name not received'); console.log(name); return `Hello, ${name}!`; -} +}; diff --git a/lab-khalid/package.json b/lab-khalid/package.json new file mode 100644 index 0000000..b9e7f5e --- /dev/null +++ b/lab-khalid/package.json @@ -0,0 +1,21 @@ +{ + "name": "lab-khalid", + "version": "1.0.0", + "description": "", + "main": "index.js", + "directories": { + "test": "test" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "devDependencies": { + "chai": "^3.5.0", + "gulp": "^3.9.1", + "gulp-eslint": "^3.0.1", + "gulp-mocha": "^3.0.1", + "mocha": "^3.2.0" + } +} diff --git a/lab-khalid/test/greeting-test.js b/lab-khalid/test/greeting-test.js index bd2b6e7..b7dc86d 100644 --- a/lab-khalid/test/greeting-test.js +++ b/lab-khalid/test/greeting-test.js @@ -1,12 +1,14 @@ 'use strict'; const greeting = require('../lib/greet.js'); -const assert = require('assert'); +const expect = require('chai').expect; + + describe('Greeting module', function() { describe('#hello', function(){ it('should return hello khalid', function() { const result = greeting.hello('khalid'); - assert.ok(result === 'Hello, khalid!', 'Not equal to Hello khalid!'); + expect(result).to.equal('Hello, khalid!'); }); }); });