Merge pull request #156 from Financial-Times/review-app-run-fix

Allow test review app to be overridden (3rd time lucky)

src/setup.mk

@@ -78,23 +78,6 @@ ASSERT_ANY_VAR_EXISTS = $(if $(findstring $(call _SORT_VARS_LIST,$1),$(call _MIS
   $(call ERROR, $(call COLOR, At least one of the variables {cyan $(strip $1)} must be defined in your Makefile))\
 )
 
-# functions for testing review or local apps
-
-# this file is created by the `review-app` task. if it exists it contains the name of
-# the review app on heroku
-REVIEW_APP=$(shell cat .review-app)
-
-# url to smoke/a11y test. prefer test url set externally
-ifndef TEST_URL
-TEST_URL = $(if $(CIRCLE_BRANCH),\
-  http://$(REVIEW_APP).herokuapp.com,\
-  https://local.ft.com:5050\
-)
-endif
-
-# exported for pa11y-ci's benefit
-export TEST_URL
-
 #
 # META TASKS
 # (specially-named targets that enable certain Make behaviour)

src/tasks/review-app.mk

@@ -1,5 +1,10 @@
+# this file is created by the `review-app` task. 
+# if it exists it contains the name of the review app
+# on heroku
+REVIEW_APP_FILE := .review-app
+
 tidy-review-app:
-	-rm .review-app
+	-rm $(REVIEW_APP_FILE)
 
 review-app: tidy-review-app .review-app
 
@@ -13,9 +18,10 @@ review-app: tidy-review-app .review-app
 		--github-token $(GITHUB_AUTH_TOKEN) > $@
 
 gtg-review-app: review-app
-	nht gtg $(REVIEW_APP)
+	nht gtg $$(cat $(REVIEW_APP_FILE))
 
-test-review-ap%:
-	make gtg-review-app
-	make smoke
-	make a11y
+test-review-ap%: # test-review-app: create and test a review app on heroku
+	$(MAKE) gtg-review-app
+	TEST_URL="http://$$(cat $(REVIEW_APP_FILE)).herokuapp.com" \
+		$(MAKE) smoke a11y
+	@$(DONE)