diff --git a/ghost/core/core/frontend/helpers/search.js b/ghost/core/core/frontend/helpers/search.js index 11bad14946..477a3c9c7e 100644 --- a/ghost/core/core/frontend/helpers/search.js +++ b/ghost/core/core/frontend/helpers/search.js @@ -4,26 +4,11 @@ const {SafeString} = require('../services/handlebars'); const {labs} = require('../services/proxy'); function search() { - const svg = ` - `; + // We want this to output as one line, but splitting for readability + const svg = ''; return new SafeString(svg); } diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js index ac35cefba6..cc1770cb43 100644 --- a/ghost/core/core/shared/labs.js +++ b/ghost/core/core/shared/labs.js @@ -17,7 +17,8 @@ const messages = { const GA_FEATURES = [ 'newsletterPaywall', 'freeTrial', - 'compExpiring' + 'compExpiring', + 'searchHelper' ]; // NOTE: this allowlist is meant to be used to filter out any unexpected @@ -30,8 +31,7 @@ const ALPHA_FEATURES = [ 'auditLog', 'urlCache', 'beforeAfterCard', - 'memberAttribution', - 'searchHelper' + 'memberAttribution' ]; module.exports.GA_KEYS = [...GA_FEATURES]; diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap index 8a30389a3c..521e088a9c 100644 --- a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap +++ b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap @@ -619,7 +619,7 @@ exports[`Settings API Edit Can edit a setting 2: [headers] 1`] = ` Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "3365", + "content-length": "3387", "content-type": "application/json; charset=utf-8", "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, "vary": "Origin, Accept-Encoding", diff --git a/ghost/core/test/unit/frontend/helpers/search.test.js b/ghost/core/test/unit/frontend/helpers/search.test.js index 282700c020..2bfc6ae0d2 100644 --- a/ghost/core/test/unit/frontend/helpers/search.test.js +++ b/ghost/core/test/unit/frontend/helpers/search.test.js @@ -27,26 +27,7 @@ describe('Search helper', function () { describe('{{search}}', function () { it('outputs the exact svg string for the search icon', function () { const templateString = '{{search}}'; - const expected = ` - `; + const expected = ''; shouldCompileToExpected(templateString, expected); });