Merge pull request #351 from fedspendingtransparency/staging

Staging -> Master
fedspendingtransparency · Jul 26, 2017 · 1114692 · 1114692
2 parents 9b7d6bb + 1e00183
commit 1114692
Show file tree

Hide file tree

Showing 88 changed files with 1,228 additions and 1,013 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,10 +36,6 @@ public
 GlobalConstants_dev.js
 GlobalConstants_local.js
 GlobalConstants_prod.js
-src/js/GlobalConstants.js
-
-# Ignore Jest Test Results
-__tests__/test-results
 
 
 # Ignore Nightwatch globals and results

diff --git a/.node-version b/.node-version
@@ -0,0 +1 @@
+6.11.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 node_js:
   # latest in each series
-  - "4"
+  - "6"
 # Need a C++ compiler
 addons:
   apt:
@@ -15,12 +15,11 @@ cache:
   directories:
     - node_modules
 before_script:
-  - npm install -g gulp
   - cp sampleGlobalConstants_dev.js GlobalConstants_dev.js
+  - cp sampleGlobalConstants_prod.js GlobalConstants_prod.js
 script:
-  - gulp buildDev
-  - gulp lint
-  - jest --runInBand
+  - npm run dev
+  - npm run travis
 after_success:
   - npm install -g codeclimate-test-reporter
   - codeclimate-test-reporter < coverage/lcov.info

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,4 @@
-FROM node:4
-
-RUN npm install --global gulp
+FROM node:6
 
 RUN mkdir /node-workspace
 COPY package.json /node-workspace 
@@ -14,5 +12,3 @@ COPY . /node-workspace
 VOLUME /node-workspace
 
 RUN mkdir /test-results
-
-CMD gulp
diff --git a/criticalVersions.json b/criticalVersions.json