Skip to content

Commit

Permalink
fix: move cypress
Browse files Browse the repository at this point in the history
  • Loading branch information
dargmuesli committed Apr 12, 2023
1 parent c66348d commit 668d30a
Show file tree
Hide file tree
Showing 17 changed files with 247 additions and 16 deletions.
19 changes: 10 additions & 9 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
# UNUSED PROPERTIES REMOVED!

# Dependency directories
nuxt/node_modules/
node_modules
nuxt/node_modules

# Nuxt.js build / generate output
nuxt/.nuxt
Expand All @@ -12,7 +13,7 @@ nuxt/.output
# End of https://www.toptal.com/developers/gitignore/api/node

# Git
nuxt/**/!.gitkeep
**/!.gitkeep

# Environment variables
**/.env
Expand All @@ -21,10 +22,10 @@ nuxt/**/!.gitkeep
.eslintcache

# Cypress
nuxt/cypress/results
nuxt/cypress/reports
nuxt/cypress/screenshots
nuxt/cypress/snapshots/actual
nuxt/cypress/snapshots/diff
nuxt/cypress/snapshots/result
nuxt/cypress/videos
cypress/results
cypress/reports
cypress/screenshots
cypress/snapshots/actual
cypress/snapshots/diff
cypress/snapshots/result
cypress/videos
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ FROM node:18.15.0-alpine@sha256:a3f2350bd3eb48525f801b57934300c11aa3610086b70885

WORKDIR /srv/app/

COPY ./nuxt/pnpm-lock.yaml ./
COPY ./pnpm-lock.yaml ./

RUN corepack enable && \
pnpm fetch

COPY ./nuxt/ ./
COPY ./ ./

RUN pnpm install --offline

Expand All @@ -52,7 +52,7 @@ COPY --from=prepare /srv/app/ ./

ENV NODE_ENV=production
RUN corepack enable && \
pnpm run generate
pnpm --dir nuxt run generate


########################
Expand All @@ -66,7 +66,7 @@ WORKDIR /srv/app/
COPY --from=prepare /srv/app/ ./

RUN corepack enable && \
pnpm run lint
pnpm --dir nuxt run lint


########################
Expand Down Expand Up @@ -108,7 +108,7 @@ WORKDIR /srv/app/
COPY --from=prepare /root/.cache/Cypress /root/.cache/Cypress
COPY --from=prepare /srv/app/ ./

RUN pnpm test:integration:dev
RUN pnpm --dir nuxt test:integration:dev


########################
Expand All @@ -126,7 +126,7 @@ COPY --from=prepare /root/.cache/Cypress /root/.cache/Cypress
COPY --from=build /srv/app/ /srv/app/
COPY --from=test-integration-dev /srv/app/package.json /tmp/test/package.json

RUN pnpm test:integration:prod
RUN pnpm --dir nuxt test:integration:prod


#######################
Expand All @@ -137,7 +137,7 @@ FROM node:18.15.0-alpine@sha256:a3f2350bd3eb48525f801b57934300c11aa3610086b70885

WORKDIR /srv/app/

COPY --from=build /srv/app/.output ./.output
COPY --from=build /srv/app/nuxt/.output ./.output
COPY --from=lint /srv/app/package.json /tmp/lint/package.json
COPY --from=test-integration-dev /srv/app/package.json /tmp/test/package.json
COPY --from=test-integration-prod /srv/app/package.json /tmp/test/package.json
Expand Down
230 changes: 230 additions & 0 deletions nuxt/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
# Created by https://www.toptal.com/developers/gitignore/api/linux,macos,node,windows
# Edit at https://www.toptal.com/developers/gitignore?templates=linux,macos,node,windows

### Linux ###
*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### macOS Patch ###
# iCloud generated files
*.icloud

### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
web_modules/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional stylelint cache
.stylelintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variable files
.env
.env.development.local
.env.test.local
.env.production.local
.env.local

# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache

# Next.js build output
.next
out

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# vuepress v2.x temp and cache directory
.temp

# Docusaurus cache and generated files
.docusaurus

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*

### Node Patch ###
# Serverless Webpack directories
.webpack/

# Optional stylelint cache

# SvelteKit build / generate output
.svelte-kit

### Windows ###
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

# End of https://www.toptal.com/developers/gitignore/api/linux,macos,node,windows

# Cypress
cypress/results
cypress/reports
cypress/screenshots
cypress/snapshots/actual
cypress/snapshots/diff
cypress/snapshots/result
cypress/videos

# Nuxt
.output
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 668d30a

Please sign in to comment.