From c2bd21d8d9f8555ef0920a30d26dac7be82d3923 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Fri, 1 Jun 2018 16:04:56 +0100 Subject: [PATCH] Move testing bits to hashicorp org, also.. Go with `rsync` over `cp` for putting the api double into public for the moment --- ui-v2/package.json | 6 +++--- ui-v2/tests/helpers/api.js | 2 +- ui-v2/tests/steps.js | 2 +- ui-v2/yarn.lock | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ui-v2/package.json b/ui-v2/package.json index 86db291b19..0ca4f53f4b 100644 --- a/ui-v2/package.json +++ b/ui-v2/package.json @@ -17,7 +17,7 @@ "test": "ember test", "test:view": "ember test --server", "precommit": "lint-staged", - "postinstall": "cp -R ./node_modules/@johncowen/consul-api-double ./public/consul-api-double" + "postinstall": "rsync -aq ./node_modules/@hashicorp/consul-api-double/ ./public/consul-api-double/" }, "lint-staged": { "{app,config,lib,server,tests}/**/*.js": [ @@ -33,8 +33,8 @@ }, "devDependencies": { - "@johncowen/ember-cli-api-double": "johncowen/ember-cli-api-double#master", - "@johncowen/consul-api-double": "johncowen/consul-api-double#master", + "@hashicorp/ember-cli-api-double": "^1.0.2", + "@hashicorp/consul-api-double": "^1.0.0", "babel-plugin-transform-object-rest-spread": "^6.26.0", "base64-js": "^1.3.0", "broccoli-asset-rev": "^2.4.5", diff --git a/ui-v2/tests/helpers/api.js b/ui-v2/tests/helpers/api.js index 902f039358..800672103e 100644 --- a/ui-v2/tests/helpers/api.js +++ b/ui-v2/tests/helpers/api.js @@ -1,4 +1,4 @@ -import getAPI from '@johncowen/ember-cli-api-double'; +import getAPI from '@hashicorp/ember-cli-api-double'; import setCookies from 'consul-ui/tests/helpers/set-cookies'; import typeToURL from 'consul-ui/tests/helpers/type-to-url'; export default getAPI('/consul-api-double', setCookies, typeToURL); diff --git a/ui-v2/tests/steps.js b/ui-v2/tests/steps.js index 87f75bac91..b948683b61 100644 --- a/ui-v2/tests/steps.js +++ b/ui-v2/tests/steps.js @@ -1,7 +1,7 @@ /* eslint no-console: "off" */ import yadda from './helpers/yadda'; import { currentURL, click, triggerKeyEvent } from '@ember/test-helpers'; -import getDictionary from '@johncowen/ember-cli-api-double/dictionary'; +import getDictionary from '@hashicorp/ember-cli-api-double/dictionary'; import pages from 'consul-ui/tests/pages'; import api from 'consul-ui/tests/helpers/api'; diff --git a/ui-v2/yarn.lock b/ui-v2/yarn.lock index edf11ee522..f55d3c13a0 100644 --- a/ui-v2/yarn.lock +++ b/ui-v2/yarn.lock @@ -69,9 +69,9 @@ dependencies: "@glimmer/di" "^0.2.0" -"@johncowen/api-double@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@johncowen/api-double/-/api-double-1.1.1.tgz#e6e7dbd54bb9615ddf4bd7293cef976cffe640ef" +"@hashicorp/api-double@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@hashicorp/api-double/-/api-double-1.1.0.tgz#299d3c560090dfe9c335db64d63c3ef0c5da79c4" dependencies: "@gardenhq/o" "^8.0.1" "@gardenhq/tick-control" "^2.0.0" @@ -81,15 +81,15 @@ faker "^4.1.0" js-yaml "^3.10.0" -"@johncowen/consul-api-double@johncowen/consul-api-double#master": - version "0.1.0" - resolved "https://codeload.github.com/johncowen/consul-api-double/tar.gz/33a81ea3ee17da91cef964ecfbe0659009ce2ca2" - -"@johncowen/ember-cli-api-double@johncowen/ember-cli-api-double#master": +"@hashicorp/consul-api-double@^1.0.0": version "1.0.0" - resolved "https://codeload.github.com/johncowen/ember-cli-api-double/tar.gz/6819bd1c8026f5623a2c32cd45f704f76887771e" + resolved "https://registry.yarnpkg.com/@hashicorp/consul-api-double/-/consul-api-double-1.0.0.tgz#1fffd85121516fe31dad32a196367ae9087f9838" + +"@hashicorp/ember-cli-api-double@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@hashicorp/ember-cli-api-double/-/ember-cli-api-double-1.0.2.tgz#684d418cc2a981254cc23035ceb452c86f0cd934" dependencies: - "@johncowen/api-double" "^1.1.1" + "@hashicorp/api-double" "^1.1.0" array-range "^1.0.1" ember-cli-babel "^6.6.0" js-yaml "^3.11.0"