From 00f4bee1302e3ca87c167f99c84e73a0100b4f6a Mon Sep 17 00:00:00 2001 From: BHess2653 Date: Sat, 3 Mar 2018 21:37:48 -0500 Subject: [PATCH 01/10] changed 50 to 150 to fix mocha error on line 5 --- src/tool.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tool.js b/src/tool.js index 0997882..bf7b406 100644 --- a/src/tool.js +++ b/src/tool.js @@ -2,7 +2,7 @@ exports.genURL = (urlLength) => { var urlString = ""; const sourceLetters = "ABCDEFGHJKMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789"; - for(var genLoopIndex = 0; genLoopIndex < 50; genLoopIndex++){ + for(var genLoopIndex = 0; genLoopIndex < 150; genLoopIndex++){ // Add a random letter to the urlString urlString += sourceLetters.charAt(Math.random() * (sourceLetters.length - 1)) From ff956f87c6f157f1a78e0799f2756ecc82aa6bf6 Mon Sep 17 00:00:00 2001 From: BHess2653 Date: Sat, 3 Mar 2018 21:38:39 -0500 Subject: [PATCH 02/10] added mocha to dependencies and mocha for the test command --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 079a25e..7fc61b8 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,13 @@ "main": "src/tool.js", "scripts": { "start": "node src/server.js", - "test": "echo \"Error: no test specified\" && exit 1" + "test": "mocha" }, "author": "chapman", "license": "ISC", "dependencies": { - "express": "^4.15.3" + "express": "^4.15.3", + "mocha": "^5.0.1" }, "devDependencies": { "chai": "^3.5.0" From 4a3bace0b83453f38557bdaf49f2d85be523b246 Mon Sep 17 00:00:00 2001 From: BHess2653 Date: Sat, 3 Mar 2018 21:45:26 -0500 Subject: [PATCH 03/10] added circleci --- .circleci/config.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..978806d --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,37 @@ +# Javascript Node CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/language-javascript/ for more details +# +version: 2 +jobs: + build: + docker: + # specify the version you desire here + - image: circleci/node:6.6 + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/mongo:3.4.4 + + working_directory: ~/repo + + steps: + - checkout + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + - run: yarn install + + - save_cache: + paths: + - node_modules + key: v1-dependencies-{{ checksum "package.json" }} + + # run tests! + - run: yarn test From 2e02ada91da5955b53742345a8f9f6a67031ede1 Mon Sep 17 00:00:00 2001 From: BHess2653 Date: Sat, 3 Mar 2018 21:53:41 -0500 Subject: [PATCH 04/10] changed node:6.6.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 978806d..11ab192 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: build: docker: # specify the version you desire here - - image: circleci/node:6.6 + - image: circleci/node:6.6.0 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images From 9d56389d266e419ce9de7d2e352686e63c41ef37 Mon Sep 17 00:00:00 2001 From: BHess2653 Date: Sat, 3 Mar 2018 21:55:02 -0500 Subject: [PATCH 05/10] added engines to pkg.json --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index 7fc61b8..0def329 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,10 @@ "version": "1.0.0", "description": "", "main": "src/tool.js", + "engines": { + "node": "v6.6.0", + "npm": "3.10.3" + }, "scripts": { "start": "node src/server.js", "test": "mocha" From 111a92fcf849e3cb6ce399206e1d3c9c0a3faec5 Mon Sep 17 00:00:00 2001 From: BHess2653 Date: Sat, 3 Mar 2018 21:56:02 -0500 Subject: [PATCH 06/10] changed node:v6.6.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 11ab192..2f42331 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: build: docker: # specify the version you desire here - - image: circleci/node:6.6.0 + - image: circleci/node:v6.6.0 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images From d513c070e538dadf4b665a34e1a11a9986e0f308 Mon Sep 17 00:00:00 2001 From: BHess2653 Date: Sat, 3 Mar 2018 22:01:31 -0500 Subject: [PATCH 07/10] changed node:6.6.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f42331..11ab192 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: build: docker: # specify the version you desire here - - image: circleci/node:v6.6.0 + - image: circleci/node:6.6.0 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images From 6314b1709e6971e067a502bc57517a5bf6782a6c Mon Sep 17 00:00:00 2001 From: BHess2653 Date: Sat, 3 Mar 2018 22:07:18 -0500 Subject: [PATCH 08/10] changed node:8.8.1 and updated pkg.json engine --- .circleci/config.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 11ab192..dab098e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: build: docker: # specify the version you desire here - - image: circleci/node:6.6.0 + - image: circleci/node:8.8.1 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images diff --git a/package.json b/package.json index 0def329..42d34cc 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "", "main": "src/tool.js", "engines": { - "node": "v6.6.0", + "node": "v8.8.1", "npm": "3.10.3" }, "scripts": { From 052b69215e20363ff186e5a052d010a0008405d4 Mon Sep 17 00:00:00 2001 From: BHess2653 Date: Sat, 3 Mar 2018 22:10:35 -0500 Subject: [PATCH 09/10] added circleCI badge --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 41b9f38..0b2e276 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ +[![CircleCI](https://circleci.com/gh/BHess2653/urlShortner.svg?style=svg)](https://circleci.com/gh/BHess2653/urlShortner) # Basic Installation and Testing. -# Prerequisites +# Prerequisites * node * npm From 2490ddffd4a406bd53f2421468d3c68138f62960 Mon Sep 17 00:00:00 2001 From: BHess2653 Date: Wed, 2 May 2018 15:52:51 -0400 Subject: [PATCH 10/10] changed line 5 in tool.js from 50 to urlLength also changed the test script in package.json to mocha --- package.json | 2 +- src/tool.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 079a25e..1699682 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "src/tool.js", "scripts": { "start": "node src/server.js", - "test": "echo \"Error: no test specified\" && exit 1" + "test": "mocha" }, "author": "chapman", "license": "ISC", diff --git a/src/tool.js b/src/tool.js index 0997882..f0ca818 100644 --- a/src/tool.js +++ b/src/tool.js @@ -2,7 +2,7 @@ exports.genURL = (urlLength) => { var urlString = ""; const sourceLetters = "ABCDEFGHJKMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789"; - for(var genLoopIndex = 0; genLoopIndex < 50; genLoopIndex++){ + for(var genLoopIndex = 0; genLoopIndex < urlLength; genLoopIndex++){ // Add a random letter to the urlString urlString += sourceLetters.charAt(Math.random() * (sourceLetters.length - 1))