Browse Source

Fix js tests (#4652)

* Fix node tests and remove meteor

* Fix node tests and remove meteor

* fix sequelize
Nate 6 years ago
parent
commit
593dc9c419

+ 1 - 1
frameworks/JavaScript/express/package.json

@@ -16,6 +16,6 @@
     "pg": "4.5.7",
     "pg": "4.5.7",
     "pg-promise": "8.4.6",
     "pg-promise": "8.4.6",
     "pug": "2.0.1",
     "pug": "2.0.1",
-    "sequelize": "3.30.0"
+    "sequelize": "3.32.1"
   }
   }
 }
 }

+ 0 - 12
frameworks/JavaScript/meteor/README.md

@@ -1,12 +0,0 @@
-# Meteor Benchmarking Test
-
-https://www.meteor.com/developers
-
-## Test URLs
-### JSON
-
-http://localhost:8080/json
-
-### PLAINTEXT
-
-http://localhost:8080/plaintext

+ 0 - 18
frameworks/JavaScript/meteor/benchmark_config.json

@@ -1,18 +0,0 @@
-{
-  "framework": "meteor",
-  "tests": [{
-    "default": {
-      "json_url": "/json",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "framework": "meteor",
-      "language": "JavaScript",
-      "flavor": "NodeJS",
-      "os": "Linux",
-      "display_name": "meteor",
-      "versus": "nodejs"
-    }
-  }]
-}

+ 0 - 14
frameworks/JavaScript/meteor/meteor.dockerfile

@@ -1,14 +0,0 @@
-FROM node:10.12.0
-
-RUN curl https://install.meteor.com | sh
-
-RUN meteor --allow-superuser create /meteor-tfb
-
-WORKDIR meteor-tfb
-
-COPY ./server ./server
-COPY package.json package.json
-
-RUN npm install
-
-CMD npm start

+ 0 - 16
frameworks/JavaScript/meteor/package.json

@@ -1,16 +0,0 @@
-{
-  "name": "meteorjs",
-  "private": false,
-  "scripts": {
-    "start": "meteor run --allow-superuser --verbose --port 8080 --unsafe-perm"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.0.0"
-  },
-  "meteor": {
-    "mainModule": {
-      "server": "server/main.js"
-    },
-    "testModule": "tests/main.js"
-  }
-}

+ 0 - 17
frameworks/JavaScript/meteor/server/main.js

@@ -1,17 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { EJSON } from 'meteor/ejson'
-import { WebApp } from 'meteor/webapp';
-
-Meteor.startup(() => {
-  WebApp.connectHandlers.use('/plaintext', (req, res) => {
-    res.setHeader('Server', 'Meteor');
-    res.setHeader('Content-Type', 'text/plain');
-    res.end("Hello, World!");
-  });
-
-  WebApp.connectHandlers.use('/json', (req, res) => {
-    res.setHeader('Server', 'Meteor');
-    res.setHeader('Content-Type', 'application/json');
-    res.end(EJSON.stringify({ message: "Hello, World!" }));
-  });
-});

+ 0 - 11
frameworks/JavaScript/nodejs/mitol.dockerfile

@@ -1,11 +0,0 @@
-FROM node:10.12.0
-
-COPY ./ ./
-
-RUN apt install -yqq wget
-RUN npm install
-RUN mkdir -p node_modules/mns & mkdir -p tmp
-RUN wget -q https://github.com/Helidium/Mitol/archive/v0.0.1.tar.gz -P tmp
-RUN tar -xzvf tmp/v0.0.1.tar.gz -C tmp
-RUN make -C tmp/Mitol-0.0.1/node
-RUN cp tmp/Mitol-0.0.1/node/dist/* node_modules/mns

+ 2 - 0
frameworks/JavaScript/nodejs/nodejs.dockerfile

@@ -6,4 +6,6 @@ COPY ./ ./
 
 
 RUN npm install
 RUN npm install
 
 
+ENV TFB_TEST_NAME=$TFB_TEST_NAME
+
 CMD ["node", "app.js"]
 CMD ["node", "app.js"]

+ 1 - 1
frameworks/JavaScript/nodejs/package.json

@@ -11,7 +11,7 @@
     "parseurl": "1.3.2",
     "parseurl": "1.3.2",
     "pg": "6.1.6",
     "pg": "6.1.6",
     "pg-hstore": "2.3.2",
     "pg-hstore": "2.3.2",
-    "sequelize": "3.30.2",
+    "sequelize": "3.32.1",
     "node-cache": "4.1.1"
     "node-cache": "4.1.1"
   },
   },
   "main": "app.js"
   "main": "app.js"

+ 1 - 1
frameworks/JavaScript/sailsjs/package.json

@@ -15,7 +15,7 @@
     "rc": "1.1.6",
     "rc": "1.1.6",
     "sails": "0.12.7",
     "sails": "0.12.7",
     "sails-disk": "0.10.10",
     "sails-disk": "0.10.10",
-    "sequelize": "3.23.4"
+    "sequelize": "3.32.1"
   },
   },
   "scripts": {
   "scripts": {
     "start": "node app.js",
     "start": "node app.js",