mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-10-03 07:48:12 +08:00
1510-smoke-test (#1548)
* 1510-smoke-test * config default * update tests * update test config * fix linter errors * more comments * address comments * use npm install in push_tests.yml * use environment.default.json * adding docs * Take care of @mweiden's nits * Save screenshots in the __tests__/screenshots/ directory * typo * docs * Add chart tests (#1580) * merge tests * check if bin creation returned null before rendering charts (#1576) * check if bin creation returned null before rendering charts * refactor chart rendering into functions (#1577) * little fixes from PR * reintroduce fix to check for null values * change getAllByClass to return element * slice instead * new stackedbar test * feedback-1573-test (#1579) * feedback-1573-test * enable whole test set * revert tests Co-authored-by: Timmy Huang <tihuan@users.noreply.github.com> * tweak test to actually render chart * include snapshot * remove async * fix getAllHistograms * properly grab id Co-authored-by: Timmy Huang <tihuan@users.noreply.github.com> Co-authored-by: Matt Weiden <538456+mweiden@users.noreply.github.com> Co-authored-by: Severiano Badajoz <sbadajoz@chanzuckerberg.com>
This commit is contained in:
co-authored by
Matt Weiden
Severiano Badajoz
parent
e22e671f10
commit
83376627e8
@@ -3,11 +3,12 @@ PATH := $(PATH):$(PROJECT_ROOT)/scripts
|
||||
|
||||
SHELL := env PATH='$(PATH)' /bin/bash
|
||||
|
||||
# get_or_else_dev_env_default
|
||||
# - If a variable is defined, return its value
|
||||
# - Else return the default value from environment.dev
|
||||
define get_or_else_dev_env_default
|
||||
$(if $($(1)),$($(1)),$(shell VAR=$$(sed -n 's/$(1)=\(.*\)/\1/p' $(PROJECT_ROOT)/environment.default); eval "echo \"$$VAR\""))
|
||||
ifeq ($(shell which jq),)
|
||||
$(error Please install jq using "apt-get install jq" or "brew install jq")
|
||||
endif
|
||||
|
||||
define GetValueFromJson
|
||||
$(shell jq -r '.$(1)' "$(PROJECT_ROOT)/environment.default.json")
|
||||
endef
|
||||
|
||||
# https://stackoverflow.com/a/14777895/9587410
|
||||
@@ -16,11 +17,11 @@ ifeq ($(shell uname),Darwin) # is Windows_NT on XP, 2000, 7, Vista, 10...
|
||||
endif
|
||||
|
||||
export CELLXGENE_COMMIT := $(shell git rev-parse --short HEAD)
|
||||
export CXG_SERVER_PORT := $(call get_or_else_dev_env_default,CXG_SERVER_PORT)
|
||||
export CXG_CLIENT_PORT := $(call get_or_else_dev_env_default,CXG_CLIENT_PORT)
|
||||
export JEST_ENV := $(call get_or_else_dev_env_default,JEST_ENV)
|
||||
export DATASET := $(call get_or_else_dev_env_default,DATASET)
|
||||
export CXG_OPTIONS := $(call get_or_else_dev_env_default,CXG_OPTIONS)
|
||||
export CXG_SERVER_PORT := $(call GetValueFromJson,CXG_SERVER_PORT)
|
||||
export CXG_CLIENT_PORT := $(call GetValueFromJson,CXG_CLIENT_PORT)
|
||||
export JEST_ENV := $(call GetValueFromJson,JEST_ENV)
|
||||
export DATASET := $(call GetValueFromJson,DATASET)
|
||||
export CXG_OPTIONS := $(call GetValueFromJson,CXG_OPTIONS)
|
||||
|
||||
.PHONY: start-server
|
||||
start-server:
|
||||
|
||||
Reference in New Issue
Block a user