Skip to content
This repository has been archived by the owner on Sep 18, 2018. It is now read-only.

Commit

Permalink
Merge pull request #97 from job13er/cleanup-e2e-test
Browse files Browse the repository at this point in the history
Fixes #96 by reverting changes to *.baseline.png
  • Loading branch information
sandersky committed Aug 27, 2015
2 parents d444908 + 7f19fdd commit 725aa50
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion make/e2e-targets.mk
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,18 @@ clean-screenshots:
$(HIDE)echo "Removing everything but *.baseline.png files from $(SCREENSHOTS_DIR)"
$(HIDE)find $(SCREENSHOTS_DIR) -type f ! -name *.baseline.png -exec rm -f {} \; || echo "No screenshots present"

remote-e2e-test: build-mock do-remote-e2e-test
cleanup-existing-screenshots:
$(HIDE)echo "Reverting any changes in $(SCREENSHOTS_DIR)"
$(HIDE)git checkout $(SCREENSHOTS_DIR)

remote-e2e-test: build-mock do-remote-e2e-test cleanup-existing-screenshots
do-remote-e2e-test: clean-screenshots create-config
ifndef WEBDRIVERIO_SERVER
$(error WEBDRIVERIO_SERVER variable needs to be set)
else
$(ENV)$(BEAKER_BIN) webdriverioTester --server $(WEBDRIVERIO_SERVER) $(WEBDRIVERIO_SERVER_EXTRAS)
endif


update-screenshots:
$(HIDE)for i in $$(find spec/e2e/screenshots -name '*.regression.png'); do mv $$i $${i/regression/baseline}; done
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "beaker",
"version": "4.3.0",
"version": "4.3.1",
"description": "Toolkit for building web interfaces",
"keywords": [
"tools",
Expand Down

0 comments on commit 725aa50

Please sign in to comment.