diff --git a/jest.setup.js b/jest.setup.js
index 0eec8abe..ddeafdcc 100644
--- a/jest.setup.js
+++ b/jest.setup.js
@@ -32,7 +32,7 @@ global.document.createRange = () => ({
const VUE_WARN_TOKEN = "[Vue warn]";
const VUE_ERROR_TOKEN = "[Vue error]";
-const _console__error = console.error; // eslint-disable-line no-console
+const _console__error = console.log; // eslint-disable-line no-console
// eslint-disable-next-line no-console
console.error = (msg, ...params) => {
@@ -40,7 +40,7 @@ console.error = (msg, ...params) => {
if (msg.indexOf(VUE_WARN_TOKEN) > -1 || msg.indexOf(VUE_ERROR_TOKEN) > -1) {
throw Error(
- "Detected a warning/error from Vue. This will fail the test that caused it. The causing error was logged above."
+ "Detected a warning/error from Vue. This will fail the test that caused it. The causing error was logged above and right here: "
);
}
};
diff --git a/package.json b/package.json
index ff7f38fb..0e705ec5 100644
--- a/package.json
+++ b/package.json
@@ -58,9 +58,9 @@
"@vue/component-compiler": "^4.0.0",
"@vue/eslint-config-prettier": "^4.0.1",
"@vue/test-utils": "1.0.0-beta.29",
- "@vuese/cli": "^2.4.1",
- "@vuese/markdown-render": "^2.2.8",
- "@vuese/parser": "^2.1.7",
+ "@vuese/cli": "^2.4.2",
+ "@vuese/markdown-render": "^2.2.9",
+ "@vuese/parser": "^2.1.8",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.8.0",
diff --git a/src/components/ButtonGroup/ButtonGroupButton.vue b/src/components/ButtonGroup/ButtonGroupButton.vue
index 1ea7f84e..f1e7f0fc 100644
--- a/src/components/ButtonGroup/ButtonGroupButton.vue
+++ b/src/components/ButtonGroup/ButtonGroupButton.vue
@@ -4,7 +4,7 @@
v-on="$listeners"
:aria-pressed="String(pressed)"
@click="toggle"
- :compact="compact"
+ :compact="finalCompact"
>
diff --git a/src/components/Form/Controls/InputMixin.js b/src/components/Form/Controls/InputMixin.js
index 852d6544..9a582e39 100644
--- a/src/components/Form/Controls/InputMixin.js
+++ b/src/components/Form/Controls/InputMixin.js
@@ -25,7 +25,7 @@ export default {
inputClasses() {
return {
"fd-form__control": !this.plain,
- "fd-input--compact": this.compact,
+ "fd-input--compact": this.finalCompact,
...this.inputStateClasses,
"is-required": this.required
};
diff --git a/src/components/Icon/__tests__/__snapshots__/Icon.test.js.snap b/src/components/Icon/__tests__/__snapshots__/Icon.test.js.snap
index c20ea452..b0d3e7a3 100644
--- a/src/components/Icon/__tests__/__snapshots__/Icon.test.js.snap
+++ b/src/components/Icon/__tests__/__snapshots__/Icon.test.js.snap
@@ -3,5 +3,6 @@
exports[`Icon Test Scripts Renders correctly 1`] = `
`;
diff --git a/src/components/InputGroup/InputGroup.vue b/src/components/InputGroup/InputGroup.vue
index 9873512e..bdb1ebc4 100644
--- a/src/components/InputGroup/InputGroup.vue
+++ b/src/components/InputGroup/InputGroup.vue
@@ -37,9 +37,7 @@ export default {
components: { FdAddonBeforeProvider, FdAddonAfterProvider },
props: {
before: { type: String, default: null },
- after: { type: String, default: null },
- afterClass: { type: String, default: null },
- compact: { type: Boolean, default: false }
+ after: { type: String, default: null }
},
computed: {
hasBefore() {
@@ -53,7 +51,7 @@ export default {
return [
"fd-input-group__addon",
"fd-input-group__addon--after",
- this.compact ? "fd-input-group--compact" : "",
+ this.finalCompact ? "fd-input-group--compact" : "",
...(afterClass != null ? [afterClass] : [])
];
},
diff --git a/src/components/InputGroup/InputGroupAddon.vue b/src/components/InputGroup/InputGroupAddon.vue
index 82ddd9ca..828a8ed4 100644
--- a/src/components/InputGroup/InputGroupAddon.vue
+++ b/src/components/InputGroup/InputGroupAddon.vue
@@ -3,6 +3,7 @@