Browse Source

SONAR-11303 fix {instance} replacement in docs

tags/7.5
Stas Vilchik 5 years ago
parent
commit
1da2b46a81

+ 1
- 1
server/sonar-docs/src/templates/page.js View File

@@ -101,7 +101,7 @@ export const query = graphql`
`;

function replaceInstanceTag(content) {
return content.replace('{instance}', 'SonarQube');
return content.replace(/{instance}/gi, 'SonarQube');
}

function replaceDynamicLinks(content) {

+ 12
- 1
server/sonar-web/src/main/js/helpers/__tests__/markdown-test.ts View File

@@ -17,7 +17,12 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import { getFrontMatter, separateFrontMatter } from '../markdown';
import { getFrontMatter, separateFrontMatter, filterContent } from '../markdown';

jest.mock('../system', () => ({
getInstance: () => 'SonarQube',
isSonarCloud: () => false
}));

it('returns parsed frontmatter of one item', () => {
expect(
@@ -105,3 +110,9 @@ it('returns full content when frontmatter has bad formatting', () => {

expect(separateFrontMatter(content)).toEqual({ content, frontmatter: {} });
});

it('replaces {instance}', () => {
expect(
filterContent('This is {instance} content. It replaces all {instance}{instance} messages')
).toBe('This is SonarQube content. It replaces all SonarQubeSonarQube messages');
});

+ 1
- 1
server/sonar-web/src/main/js/helpers/markdown.js View File

@@ -73,7 +73,7 @@ function parseFrontMatter(lines) {
*/
function filterContent(content) {
const { isSonarCloud, getInstance } = require('./system');
const contentWithInstance = content.replace('{instance}', getInstance());
const contentWithInstance = content.replace(/{instance}/gi, getInstance());
const contentWithoutStatic = cutConditionalContent(contentWithInstance, 'static');
return isSonarCloud()
? cutConditionalContent(contentWithoutStatic, 'sonarqube')

Loading…
Cancel
Save