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;
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;
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