Merge branch 'features/remote-prepare' into beta

master
Raymonzut 5 years ago
commit 15411e8b89
No known key found for this signature in database
GPG Key ID: 97CF2D8BE2C69FC7
  1. 1
      .github/workflows/nodejs.yml
  2. 0
      client/babel.config.js
  3. 0
      client/package-lock.json
  4. 0
      client/package.json
  5. 0
      client/src/App.vue
  6. 0
      client/src/assets/logo.png
  7. 0
      client/src/components/aboutme.vue
  8. 0
      client/src/components/answer.vue
  9. 0
      client/src/components/qa.vue
  10. 0
      client/src/components/question.vue
  11. 0
      client/src/main.js
  12. 0
      client/src/me.js
  13. 7
      client/src/remote.js
  14. 0
      client/test/me.js
  15. 25
      client/test/remote.js
  16. 4
      docker-compose.yml
  17. 6
      docker/dev/Dockerfile

@ -21,6 +21,7 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: cd client/
- run: npm ci
- run: npm run build --if-present
- run: npm test

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

@ -0,0 +1,7 @@
module.exports = {
postData: [
{ title: 'A walk in the park' },
{ title: 'Down the road', author: 'Alice' },
{ title: 'On a summer day', author: 'Bob' },
],
}

@ -0,0 +1,25 @@
const assert = require('chai').assert
const remote = require('../src/remote')
describe('remote', () => {
const data = remote.postData
describe('postData', () => {
it('should return an array', () => {
assert.typeOf(data, 'array')
})
it('should not be empty', () => {
assert.isAtLeast(data.length, 1)
})
it('should contain objects', () => {
for (obj of data) {
assert.typeOf(obj, 'object')
}
})
it('should have objects with properties', () => {
for (obj of data) {
assert.isAtLeast(Object.keys(obj).length, 1)
}
})
})
})

@ -1,4 +1,4 @@
version: "3"
version: '3'
services:
website-dev:
@ -6,6 +6,6 @@ services:
context: ./
dockerfile: docker/dev/Dockerfile
volumes:
- ./src:/var/www/app
- ./client/src:/var/www/app
ports:
- 8080:8080

@ -4,16 +4,16 @@ FROM node:lts-alpine
WORKDIR /app
# get the sauce
COPY /src/ /app/src/
COPY /client/src/ /app/src/
# add `/app/node_modules/.bin` to $PATH
ENV PATH /app/node_modules/.bin:$PATH
# make sure the packages are the same
COPY package-lock.json /app/package.json
COPY /client/package-lock.json /app/package.json
# install and cache app dependencies
COPY package.json /app/package.json
COPY /client/package.json /app/package.json
RUN npm install
# start app

Loading…
Cancel
Save