Clean versions and test script

This commit is contained in:
Alexandre Bodin 2019-05-03 09:47:23 +02:00
parent 8f6b85dd49
commit bdd83eb689
40 changed files with 103 additions and 104 deletions

View File

@ -11,18 +11,17 @@ node_js:
- '10'
cache:
yarn: true
directories:
- node_modules
- ~/.npm
- ~/.cache
# end to end testing template
e2e_tests: &e2e_tests
stage: 'End to End tests'
script:
- npm run -s test:generate-app -- $DB_STRING
- npm run -s test:start-app & wait-on http://localhost:1337
- npm run -s test:e2e
- yarn run -s test:generate-app -- $DB_STRING
- yarn run -s test:start-app & wait-on http://localhost:1337
- yarn run -s test:e2e
install_mongo: &install_mongo
before_install:
@ -33,22 +32,22 @@ install_mongo: &install_mongo
- ./mongodb-linux-x86_64-3.6.6/bin/mongod --fork --dbpath ./data/db/27017 --syslog --port 27017
install:
- npm run setup:ci
- npm install -g wait-on
- yarn run -s bootstrap
- yarn global add -g wait-on
jobs:
include:
- stage: test
name: Snyk
script: npm run -s test:snyk
script: yarn run -s test:snyk
if: fork = false
- stage: test
name: 'Lint / Unit Tests '
script:
- npm run -s lint
- npm run -s test:unit
# - npm run -s test:front
- yarn run -s lint
- yarn run -s test:unit
# - yarn run -s test:front
- <<: *e2e_tests
name: 'E2E Postgresql'
@ -78,10 +77,10 @@ jobs:
- name: 'Cypress tests'
<<: *install_mongo
install:
- npm run setup:build
- npm install -g wait-on
- yarn run -s bootstrap
- yarn global add -g wait-on
- cypress install
script:
- npm run -s test:generate-app -- --dbclient=mongo --dbhost=localhost --dbport=27017 --dbname=strapi_test --dbusername= --dbpassword=
- npm run -s test:start-app & wait-on http://localhost:1337
- yarn run -s test:generate-app -- --dbclient=mongo --dbhost=localhost --dbport=27017 --dbname=strapi_test --dbusername= --dbpassword=
- yarn run -s test:start-app & wait-on http://localhost:1337
- node test/cypress.js

View File

@ -1,7 +1,7 @@
{
"name": "getstarted",
"private": true,
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "A Strapi application.",
"main": "./server.js",
"scripts": {
@ -23,22 +23,22 @@
"lodash": "^4.17.5",
"pg": "^7.10.0",
"sqlite3": "^4.0.6",
"strapi": "3.0.0-beta.0",
"strapi-admin": "3.0.0-beta.0",
"strapi-hook-bookshelf": "3.0.0-beta.0",
"strapi-hook-knex": "3.0.0-beta.0",
"strapi-middleware-views": "3.0.0-beta.0",
"strapi-plugin-content-manager": "3.0.0-beta.0",
"strapi-plugin-content-type-builder": "3.0.0-beta.0",
"strapi-plugin-documentation": "3.0.0-beta.0",
"strapi-plugin-email": "3.0.0-beta.0",
"strapi-plugin-graphql": "3.0.0-beta.0",
"strapi-plugin-settings-manager": "3.0.0-beta.0",
"strapi-plugin-upload": "3.0.0-beta.0",
"strapi-plugin-users-permissions": "3.0.0-beta.0",
"strapi-provider-email-mailgun": "3.0.0-beta.0",
"strapi-provider-upload-aws-s3": "3.0.0-beta.0",
"strapi-utils": "3.0.0-beta.0"
"strapi": "3.0.0-alpha.26.1",
"strapi-admin": "3.0.0-alpha.26.1",
"strapi-hook-bookshelf": "3.0.0-alpha.26.1",
"strapi-hook-knex": "3.0.0-alpha.26.1",
"strapi-middleware-views": "3.0.0-alpha.26.1",
"strapi-plugin-content-manager": "3.0.0-alpha.26.1",
"strapi-plugin-content-type-builder": "3.0.0-alpha.26.1",
"strapi-plugin-documentation": "3.0.0-alpha.26.1",
"strapi-plugin-email": "3.0.0-alpha.26.1",
"strapi-plugin-graphql": "3.0.0-alpha.26.1",
"strapi-plugin-settings-manager": "3.0.0-alpha.26.1",
"strapi-plugin-upload": "3.0.0-alpha.26.1",
"strapi-plugin-users-permissions": "3.0.0-alpha.26.1",
"strapi-provider-email-mailgun": "3.0.0-alpha.26.1",
"strapi-provider-upload-aws-s3": "3.0.0-alpha.26.1",
"strapi-utils": "3.0.0-alpha.26.1"
},
"author": {
"name": "alex",

View File

@ -1,5 +1,5 @@
{
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"packages": [
"packages/*",
"examples/*"

View File

@ -1,6 +1,6 @@
{
"private": true,
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"dependencies": {},
"devDependencies": {
"@babel/core": "^7.4.3",
@ -52,6 +52,7 @@
"scripts": {
"bootstrap": "yarn install && lerna bootstrap",
"watch": "lerna run --stream watch",
"lint": "echo \"To implement\"",
"test:clean": "rimraf ./coverage",
"test:front": "npm run test:clean && cross-env NODE_ENV=test jest --config ./jest.config.front.js --coverage",
"test:front:watch": "cross-env NODE_ENV=test jest --config ./jest.config.front.js --watchAll",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-admin",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Strapi Admin",
"repository": {
"type": "git",
@ -72,8 +72,8 @@
"sanitize.css": "^4.1.0",
"sass-loader": "^7.1.0",
"shelljs": "^0.7.8",
"strapi-helper-plugin": "3.0.0-beta.0",
"strapi-utils": "3.0.0-beta.0",
"strapi-helper-plugin": "3.0.0-alpha.26.1",
"strapi-utils": "3.0.0-alpha.26.1",
"style-loader": "^0.23.1",
"styled-components": "^4.2.0",
"terser-webpack-plugin": "^1.2.3",
@ -82,7 +82,7 @@
"webpack": "^4.29.6"
},
"peerDependencies": {
"strapi-admin": "3.0.0-beta.0"
"strapi-admin": "3.0.0-alpha.26.1"
},
"author": {
"name": "Strapi",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-api",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Generate an API for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-controller",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-model",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Generate a model for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-new",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Generate a new Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -22,7 +22,7 @@
"ora": "^2.1.0",
"request": "^2.88.0",
"rimraf": "^2.6.3",
"strapi-utils": "3.0.0-beta.0",
"strapi-utils": "3.0.0-alpha.26.1",
"uuid": "^3.1.0"
},
"scripts": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-plugin",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Generate an plugin for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-policy",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Generate a policy for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-service",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Generate a service for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Master of ceremonies for the Strapi generators.",
"homepage": "http://strapi.io",
"keywords": [
@ -20,7 +20,7 @@
"fs-extra": "^4.0.0",
"lodash": "^4.17.5",
"reportback": "^2.0.1",
"strapi-utils": "3.0.0-beta.0"
"strapi-utils": "3.0.0-alpha.26.1"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-helper-plugin",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Helper for Strapi plugins development",
"files": [
"dist"

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-bookshelf",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Bookshelf hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -21,8 +21,8 @@
"lodash": "^4.17.5",
"pluralize": "^6.0.0",
"rimraf": "^2.6.2",
"strapi-hook-knex": "3.0.0-beta.0",
"strapi-utils": "3.0.0-beta.0"
"strapi-hook-knex": "3.0.0-alpha.26.1",
"strapi-utils": "3.0.0-alpha.26.1"
},
"strapi": {
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-ejs",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "EJS hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-knex",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Knex hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-mongoose",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Mongoose hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -20,7 +20,7 @@
"mongoose-float": "^1.0.3",
"pluralize": "^6.0.0",
"rimraf": "^2.6.2",
"strapi-utils": "3.0.0-beta.0"
"strapi-utils": "3.0.0-alpha.26.1"
},
"author": {
"email": "hi@strapi.io",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-redis",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Redis hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -19,7 +19,7 @@
"lodash": "^4.17.5",
"rimraf": "^2.6.2",
"stack-trace": "0.0.10",
"strapi-utils": "3.0.0-beta.0"
"strapi-utils": "3.0.0-alpha.26.1"
},
"author": {
"email": "hi@strapi.io",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-middleware-views",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Views middleware to enable server-side rendering for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-manager",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "A powerful UI to easily manage your data.",
"strapi": {
"name": "Content Manager",
@ -15,8 +15,8 @@
"draft-js": "^0.10.5",
"pluralize": "^7.0.0",
"showdown": "^1.9.0",
"strapi-helper-plugin": "3.0.0-beta.0",
"strapi-utils": "3.0.0-beta.0"
"strapi-helper-plugin": "3.0.0-alpha.26.1",
"strapi-utils": "3.0.0-alpha.26.1"
},
"peerDependencies": {
"classnames": "^2.2.6",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-type-builder",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Strapi plugin to create content type (API).",
"strapi": {
"name": "Content Type Builder",
@ -13,9 +13,9 @@
"dependencies": {
"immutable": "^3.8.2",
"pluralize": "^7.0.0",
"strapi-generate": "3.0.0-beta.0",
"strapi-generate-api": "3.0.0-beta.0",
"strapi-helper-plugin": "3.0.0-beta.0"
"strapi-generate": "3.0.0-alpha.26.1",
"strapi-generate-api": "3.0.0-alpha.26.1",
"strapi-helper-plugin": "3.0.0-alpha.26.1"
},
"peerDependencies": {
"classnames": "^2.2.6",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-documentation",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Documentation",
@ -14,7 +14,7 @@
"cheerio": "^1.0.0-rc.2",
"moment": "^2.22.2",
"path-to-regexp": "^2.4.0",
"strapi-helper-plugin": "3.0.0-beta.0",
"strapi-helper-plugin": "3.0.0-alpha.26.1",
"swagger-ui-dist": "3.22.1"
},
"peerDependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-email",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Email",
@ -11,9 +11,9 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"strapi-helper-plugin": "3.0.0-beta.0",
"strapi-provider-email-sendmail": "3.0.0-beta.0",
"strapi-utils": "3.0.0-beta.0"
"strapi-helper-plugin": "3.0.0-alpha.26.1",
"strapi-provider-email-sendmail": "3.0.0-alpha.26.1",
"strapi-utils": "3.0.0-alpha.26.1"
},
"peerDependencies": {
"classnames": "^2.2.6",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-graphql",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "This is the description of the plugin.",
"strapi": {
"name": "graphql",
@ -22,7 +22,7 @@
"graphql-type-json": "^0.2.1",
"graphql-type-long": "^0.1.1",
"pluralize": "^7.0.0",
"strapi-utils": "3.0.0-beta.0"
"strapi-utils": "3.0.0-alpha.26.1"
},
"devDependencies": {
"cross-env": "^5.2.0",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-settings-manager",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Strapi plugin to manage settings.",
"strapi": {
"name": "Settings Manager",
@ -12,7 +12,7 @@
},
"dependencies": {
"shelljs": "^0.7.8",
"strapi-helper-plugin": "3.0.0-beta.0"
"strapi-helper-plugin": "3.0.0-alpha.26.1"
},
"peerDependencies": {
"classnames": "^2.2.6",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-upload",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Files Upload",
@ -11,9 +11,9 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"strapi-helper-plugin": "3.0.0-beta.0",
"strapi-provider-upload-local": "3.0.0-beta.0",
"strapi-utils": "3.0.0-beta.0",
"strapi-helper-plugin": "3.0.0-alpha.26.1",
"strapi-provider-upload-local": "3.0.0-alpha.26.1",
"strapi-utils": "3.0.0-alpha.26.1",
"stream-to-array": "^2.3.0",
"uuid": "^3.2.1"
},

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-users-permissions",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Protect your API with a full-authentication process based on JWT",
"strapi": {
"name": "Roles & Permissions",
@ -31,8 +31,8 @@
"reactstrap": "^5.0.0",
"redux-saga": "^0.16.0",
"request": "^2.83.0",
"strapi-helper-plugin": "3.0.0-beta.0",
"strapi-utils": "3.0.0-beta.0",
"strapi-helper-plugin": "3.0.0-alpha.26.1",
"strapi-utils": "3.0.0-alpha.26.1",
"uuid": "^3.1.0"
},
"author": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-amazon-ses",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Amazon SES provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-mailgun",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Mailgun provider for strapi email plugin",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-sendgrid",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Sendgrid provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-sendmail",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Sendmail provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-aws-s3",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "AWS S3 provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-cloudinary",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Cloudinary provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-local",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Local provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-rackspace",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Rackspace provider for strapi upload",
"main": "./lib",
"keywords": [],

View File

@ -1,6 +1,6 @@
{
"name": "strapi-utils",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "Shared utilities for the Strapi packages",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi",
"version": "3.0.0-beta.0",
"version": "3.0.0-alpha.26.1",
"description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.",
"homepage": "http://strapi.io",
"keywords": [
@ -62,15 +62,15 @@
"ora": "^3.0.0",
"rimraf": "^2.6.2",
"shelljs": "^0.8.3",
"strapi-generate": "3.0.0-beta.0",
"strapi-generate-api": "3.0.0-beta.0",
"strapi-generate-controller": "3.0.0-beta.0",
"strapi-generate-model": "3.0.0-beta.0",
"strapi-generate-new": "3.0.0-beta.0",
"strapi-generate-plugin": "3.0.0-beta.0",
"strapi-generate-policy": "3.0.0-beta.0",
"strapi-generate-service": "3.0.0-beta.0",
"strapi-utils": "3.0.0-beta.0"
"strapi-generate": "3.0.0-alpha.26.1",
"strapi-generate-api": "3.0.0-alpha.26.1",
"strapi-generate-controller": "3.0.0-alpha.26.1",
"strapi-generate-model": "3.0.0-alpha.26.1",
"strapi-generate-new": "3.0.0-alpha.26.1",
"strapi-generate-plugin": "3.0.0-alpha.26.1",
"strapi-generate-policy": "3.0.0-alpha.26.1",
"strapi-generate-service": "3.0.0-alpha.26.1",
"strapi-utils": "3.0.0-alpha.26.1"
},
"scripts": {
"test": "jest --verbose",

View File

@ -46,7 +46,6 @@ yargs
yargs.boolean('run-once').boolean('quiet');
},
argv => {
console.log(argv);
const source = path.resolve(__dirname, '..', 'packages');
const dest = path.resolve(process.cwd(), argv.dest);
watch(source, dest, argv);

View File

@ -49,7 +49,7 @@ const generateTestApp = async ({ appName, database }) => {
* @param {string} options.appName - Name of the app / folder in which run the start script
*/
const startTestApp = ({ appName }) => {
return execa.shell('strapi start', {
return execa.shell('strapi dev', {
stdio: 'inherit',
cwd: path.resolve(appName),
});