diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7ed57ab3..8b575b4d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,7 +9,7 @@ jobs: uses: actions/checkout@v2 - name: npm test uses: actions/setup-node@v1 - - name: npm it + - name: Run NPM Tests run: npm it go-test: name: go test @@ -21,13 +21,13 @@ jobs: go-version: 1.14.x - name: Checkout code uses: actions/checkout@v2 - - name: Test + - name: Run Go Tests run: go test -cover ./... docker-build: - name: docker build + name: Integration Tests runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v2 - - name: Docker Build - run: docker build . + - name: Run tests + run: docker-compose -f integration/docker-compose.test.yml run integration diff --git a/integration/__image_snapshots__/test-js-home-page-renders-full-page-on-desktop-1-snap.png b/integration/__image_snapshots__/test-js-home-page-renders-full-page-on-desktop-1-snap.png index fe708f6f..2c09bd27 100644 Binary files a/integration/__image_snapshots__/test-js-home-page-renders-full-page-on-desktop-1-snap.png and b/integration/__image_snapshots__/test-js-home-page-renders-full-page-on-desktop-1-snap.png differ diff --git a/integration/test.js b/integration/test.js index 7c69f2b3..0095d380 100644 --- a/integration/test.js +++ b/integration/test.js @@ -9,7 +9,7 @@ describe("home page", () => { browser = await puppeteer.launch({ args: ["--no-sandbox", "--disable-setuid-sandbox"], executablePath: process.env.CHROME_EXE_PATH || "", - defaultViewport: { width: 1280, height: 1080 }, + defaultViewport: { width: 1920, height: 1200 }, }); }); diff --git a/package.json b/package.json index 841696ef..cad8d0f4 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "build": "npx parcel build --no-source-maps --public-url '__BASE__' assets/index.html -d static", "clean": "rm -rf static/ a_main-packr.go", "release": "release-it", - "test": "jest" + "test": "jest", + "integration": "docker-compose -f integration/docker-compose.test.yml run integration" }, "repository": { "type": "git",