Skip to content

Commit 0c8f059

Browse files
authored
Merge pull request #65 from humpbackdev/feature/add-backstop
Add backstop
2 parents 478d2e9 + 12fabb9 commit 0c8f059

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

generators/app/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ module.exports = class extends Generator {
4949

5050
writing() {
5151
var self = this;
52-
remote('humpbackdev', 'humpback', 'v1.20', function(err, extractPath) {
52+
remote('humpbackdev', 'humpback', 'v1.21', function(err, extractPath) {
5353
self.fs.copy(extractPath, self.destinationPath('./'));
5454
self.fs.copy(extractPath + '/.ahoy', self.destinationPath('.ahoy'));
5555
self.fs.copy(extractPath + '/.ahoy.yml', self.destinationPath('.ahoy.yml'));

generators/app/templates/circleci/config.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: kporras07/docker-drupal-nginx:php-7.2.x
5+
- image: kporras07/docker-drupal-nginx:php-7.2.x-backstop
66
- image: selenium/standalone-chrome-debug:3.6.0
77
- image: kporras07/lighthouse-ci:nonheadless
88
- image: mariadb:5.5
@@ -18,14 +18,6 @@ jobs:
1818
keys:
1919
- npm-cache-{{ checksum "package.json" }}
2020
- composer-cache-{{ checksum "composer.lock" }}
21-
- run:
22-
name: Install Node 6
23-
command: |
24-
curl "https://deb.nodesource.com/setup_6.x" -o "setup_6.x"
25-
chmod +x setup_6.x
26-
./setup_6.x
27-
rm setup_6.x
28-
apt-get install nodejs -y
2921
- run: npm install
3022
- save_cache:
3123
key: npm-cache-{{ checksum "package.json" }}
@@ -59,6 +51,14 @@ jobs:
5951
./node_modules/.bin/gulp phplint
6052
./node_modules/.bin/gulp drupalcs
6153
./node_modules/.bin/gulp eslint
54+
- run:
55+
name: Backstop
56+
command: |
57+
backstop reference
58+
backstop test
59+
- store_artifacts:
60+
path: ./backstop_data
61+
destination: backstop
6262
- run:
6363
name: Behat Testing
6464
command: |
@@ -159,7 +159,7 @@ jobs:
159159
160160
deploy-multidev:
161161
docker:
162-
- image:kporras07/docker-drupal-nginx:php-7.2.x
162+
- image: kporras07/docker-drupal-nginx:php-7.2.x
163163
working_directory: /var/www/<%= appName %>
164164
steps:
165165
- checkout
@@ -174,14 +174,15 @@ jobs:
174174
mv composer.phar /usr/bin/composer
175175
mkdir $HOME/terminus && cd $HOME/terminus
176176
curl -O https://raw.githubusercontent.com/pantheon-systems/terminus-installer/master/builds/installer.phar && php installer.phar install
177+
ln -s $HOME/terminus/vendor/bin/terminus /usr/bin/terminus
177178
terminus auth:login --machine-token=$PANTHEON_TOKEN
179+
cd /var/www/<%= appName %>
178180
- run: composer install
179181
- run:
180182
name: Install ahoy
181183
command: |
182184
apt-get update -y && apt-get install wget -y
183-
wget -q https://github.com/devinci-code/ahoy/releases/download/1.1.0/ahoy-`uname -s`-amd64 -O /usr/local/bin/ahoy && chmod +x /usr/local/bin/ahoy
184-
- checkout
185+
wget -q https://github.com/devinci-code/ahoy/releases/download/2.0.0/ahoy-`uname -s`-amd64 -O /usr/local/bin/ahoy && chmod +x /usr/local/bin/ahoy
185186
- add_ssh_keys:
186187
fingerprints:
187188
# @TODO: Add ssh_key fingerprint here.

generators/app/templates/gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ node_modules
99
# Lighthouse output
1010
lighthouse.html
1111

12+
# BackstopJS
13+
backstop_data/html_report/
14+
backstop_data/bitmaps_reference/
15+
backstop_data/bitmaps_test/
16+
1217
# Builds
1318
web/*
1419
!web/.gitkeep

0 commit comments

Comments
 (0)