mirror of https://github.com/hashicorp/consul
Browse Source
Previously `api-double` usage in ember would require a bunch of `fetch` requests to pull in the 'api double', this had a number of disadvantages. 1. The doubles needed to be available via HTTP, which meant a short term solution of rsyncing the double files over to `public` in order to be served over HTTP. An alternative to that would have been figuring out how to serve something straight from `node_modules`, which would have been preferable. 2. ember/testem would not serve dot files (so anything starting with a ., like `.config`. To solve this via ember/testem would have involved digging in to understand how to enable the serving of dot files. 3. ember/testem automatically rewrote urls for non-existant files to folders, i.e. adding a slash for you, so `/v1/connect/intentions` would be rewritten to `/v1/connect/intentions/`. This is undesirable, and solving this via ember/testem would have involved digging deep to disable that. Serving the files via HTTP has now changed. The double files are now embedded into the HTML has 'embedded templates' that can be found by using the url of the file and a simple `querySelector`. This of course only happens during testing and means I can fully control the 'serving' of the doubles now, so I can say goodbye to the need to move files around, worry about the need to serve dotfiles and the undesirable trailing slashes rewriting. Winner! Find the files and embedding them is done using a straightforward recursive-readdir-sync (the `content-for` functionality is a synchronous api) as oppose to getting stuck into `broccoli`.pull/4326/head
John Cowen
6 years ago
6 changed files with 58 additions and 36 deletions
@ -1,28 +1,31 @@ |
|||||||
ROOT:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
|
ROOT:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
|
||||||
|
|
||||||
all: build |
all: build |
||||||
|
|
||||||
deps: node_modules |
deps: node_modules |
||||||
|
|
||||||
build: deps |
build: deps |
||||||
yarn run build
|
yarn run build
|
||||||
|
|
||||||
start: deps |
start: deps |
||||||
yarn run start
|
yarn run start
|
||||||
|
|
||||||
|
start-api: deps |
||||||
|
yarn run start:api
|
||||||
|
|
||||||
test: deps |
test: deps |
||||||
yarn run test
|
yarn run test
|
||||||
|
|
||||||
test-view: deps |
test-view: deps |
||||||
yarn run test:view
|
yarn run test:view
|
||||||
|
|
||||||
lint: deps |
lint: deps |
||||||
yarn run lint:js
|
yarn run lint:js
|
||||||
|
|
||||||
format: deps |
format: deps |
||||||
yarn run format:js
|
yarn run format:js
|
||||||
|
|
||||||
node_modules: yarn.lock package.json |
node_modules: yarn.lock package.json |
||||||
yarn install
|
yarn install
|
||||||
|
|
||||||
.PHONY: all deps build start test test-view lint format |
.PHONY: all deps build start test test-view lint format |
||||||
|
|||||||
@ -1,4 +1,14 @@ |
|||||||
import getAPI from '@hashicorp/ember-cli-api-double'; |
import getAPI from '@hashicorp/ember-cli-api-double'; |
||||||
import setCookies from 'consul-ui/tests/helpers/set-cookies'; |
import setCookies from 'consul-ui/tests/helpers/set-cookies'; |
||||||
import typeToURL from 'consul-ui/tests/helpers/type-to-url'; |
import typeToURL from 'consul-ui/tests/helpers/type-to-url'; |
||||||
export default getAPI('/consul-api-double', setCookies, typeToURL); |
import config from 'consul-ui/config/environment'; |
||||||
|
const apiConfig = config['ember-cli-api-double']; |
||||||
|
let path = '/consul-api-double'; |
||||||
|
let reader; |
||||||
|
if (apiConfig) { |
||||||
|
const temp = apiConfig.endpoints[0].split('/'); |
||||||
|
reader = apiConfig.reader; |
||||||
|
temp.pop(); |
||||||
|
path = temp.join('/'); |
||||||
|
} |
||||||
|
export default getAPI(path, setCookies, typeToURL, reader); |
||||||
|
|||||||
Loading…
Reference in new issue