From 44deab454d3974542b2fda4aa2e7649fb7b2a4f5 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Mon, 25 Jun 2018 12:11:01 +0100 Subject: [PATCH 1/3] Reset `` after every test, back to its original static value --- ui-v2/tests/acceptance/startup.feature | 1 - ui-v2/tests/helpers/yadda-annotations.js | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ui-v2/tests/acceptance/startup.feature b/ui-v2/tests/acceptance/startup.feature index 70e54705ca..a847fef3d6 100644 --- a/ui-v2/tests/acceptance/startup.feature +++ b/ui-v2/tests/acceptance/startup.feature @@ -3,7 +3,6 @@ Feature: startup In order to give users an indication as early as possible that they are at the right place As a user I should be able to see a startup logo -@ignore Scenario: When loading the index.html file into a browser Given 1 datacenter model with the value "dc-1" Then the url should be '' diff --git a/ui-v2/tests/helpers/yadda-annotations.js b/ui-v2/tests/helpers/yadda-annotations.js index 7c972601e4..43cc67853b 100644 --- a/ui-v2/tests/helpers/yadda-annotations.js +++ b/ui-v2/tests/helpers/yadda-annotations.js @@ -3,6 +3,18 @@ import { skip } from 'qunit'; import { setupApplicationTest, setupRenderingTest, setupTest } from 'ember-qunit'; import api from 'consul-ui/tests/helpers/api'; +const staticClassList = [...document.documentElement.classList]; +function reset() { + window.localStorage.clear(); + api.server.reset(); + const list = document.documentElement.classList; + while (list.length > 0) { + list.remove(list.item(0)); + } + staticClassList.forEach(function(item) { + list.add(item); + }); +} // this logic could be anything, but in this case... // if @ignore, then return skip (for backwards compatibility) // if have annotations in config, then only run those that have a matching annotation @@ -64,8 +76,7 @@ function setupScenario(featureAnnotations, scenarioAnnotations) { } return function(model) { model.afterEach(function() { - window.localStorage.clear(); - api.server.reset(); + reset(); }); }; // return setupFn; From 8e7e224f3fdb69497e000c25c5c109b6aa1d6b1f Mon Sep 17 00:00:00 2001 From: John Cowen Date: Tue, 26 Jun 2018 10:48:26 +0100 Subject: [PATCH 2/3] Encode all the hexcodes --- ui-v2/app/styles/components/icons.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui-v2/app/styles/components/icons.scss b/ui-v2/app/styles/components/icons.scss index 5b4c139302..e12d1fae52 100644 --- a/ui-v2/app/styles/components/icons.scss +++ b/ui-v2/app/styles/components/icons.scss @@ -152,18 +152,18 @@ } %with-right-arrow-grey { @extend %pseudo-icon; - background-image: url('data:image/svg+xml;charset=UTF-8,'); + background-image: url('data:image/svg+xml;charset=UTF-8,'); } %with-deny-icon { @extend %pseudo-icon; - background-image: url('data:image/svg+xml;charset=UTF-8,'); + background-image: url('data:image/svg+xml;charset=UTF-8,'); width: 16px; height: 16px; background-color: transparent; } %with-deny-icon-grey { @extend %pseudo-icon; - background-image: url('data:image/svg+xml;charset=UTF-8,'); + background-image: url('data:image/svg+xml;charset=UTF-8,'); } %with-deny::before { @extend %with-deny-icon; From 7f35ca33f4a2753f6d6e7a7b635e1594f977c38d Mon Sep 17 00:00:00 2001 From: Paul Banks Date: Tue, 3 Jul 2018 14:54:44 +0100 Subject: [PATCH 3/3] Remove the TODO latency measurement. --- website/source/docs/connect/proxies.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/connect/proxies.html.md b/website/source/docs/connect/proxies.html.md index 32fbe2603a..2d60c92f45 100644 --- a/website/source/docs/connect/proxies.html.md +++ b/website/source/docs/connect/proxies.html.md @@ -41,7 +41,7 @@ The default managed proxy is a basic proxy built-in to Consul and written in Go. Having a basic built-in proxy allows Consul to have a sane default with performance that is good enough for most workloads. In some basic benchmarks, the service-to-service communication over the built-in proxy -could sustain 5 Gbps with a per-hop latency of less than X microseconds. Therefore, +could sustain 5 Gbps with sub-millisecond latency. Therefore, the performance impact of even the basic built-in proxy is minimal. Consul will be