From e0d6c43c468c40ad2f22785549977e4e9fe6547c Mon Sep 17 00:00:00 2001 From: Wil Moore III Date: Sat, 1 Mar 2014 23:57:36 -0700 Subject: [PATCH 1/2] make JS tests run again --- Makefile | 2 +- README.md | 15 ++++++++++++++- assignments/javascript/.gitignore | 2 -- 3 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 assignments/javascript/.gitignore diff --git a/Makefile b/Makefile index b7d79c04..cb88a490 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # assignments ASSIGNMENT ?= "" IGNOREDIRS := "node_modules" -ASSIGNMENTS = $(shell find . -maxdepth 1 -mindepth 1 -type d | tr -d './' | sort | grep -Ev $(IGNOREDIRS)) +ASSIGNMENTS = $(shell find . -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' | tr -d './' | sort | grep -Ev $(IGNOREDIRS)) # output directories TMPDIR ?= "/tmp" diff --git a/README.md b/README.md index de27183e..49c4b724 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,20 @@ -# xJavaScript +# xJavaScript [![Build Status](https://travis-ci.org/exercism/xjavascript.png?branch=master)](https://travis-ci.org/exercism/xjavascript) Exercism exercises in JavaScript + +## Running Unit Test Suite + +### All Assignments + + % make test + +### Single Assignment + + % make test-assignment ASSIGNMENT=wordy + ## License + The MIT License (MIT) Copyright (c) 2014 Katrina Owen, _@kytrinyx.com + diff --git a/assignments/javascript/.gitignore b/assignments/javascript/.gitignore deleted file mode 100644 index 93f13619..00000000 --- a/assignments/javascript/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -node_modules -npm-debug.log From af751fd10ddff43b9ecc5b91fa61218ebf9fd5d9 Mon Sep 17 00:00:00 2001 From: Wil Moore III Date: Sat, 1 Mar 2014 23:58:29 -0700 Subject: [PATCH 2/2] fix gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cfba75e0..61d374b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -*.beam *.swp .DS_Store node_modules +npm-debug.log tmp