Skip to content

Commit e8266a3

Browse files
wickedestshockey
authored andcommitted
fix: code highlight styles are now only applied pre.microlight (#5673)
* patch(#5672): code highlight styles are now only applied to pre blocks that have the class pre.microlight * fixed pre style appied to .request-url * fixed response-headers and request-duration pre blocks * made pre.microlight class as per review * added microlight class to appropriate pre and added tests
1 parent 7e5974c commit e8266a3

File tree

4 files changed

+23
-8
lines changed

4 files changed

+23
-8
lines changed

src/core/components/live-response.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const Headers = ( { headers } )=>{
77
return (
88
<div>
99
<h5>Response headers</h5>
10-
<pre>{headers}</pre>
10+
<pre className="microlight">{headers}</pre>
1111
</div>)
1212
}
1313
Headers.propTypes = {
@@ -18,7 +18,7 @@ const Duration = ( { duration } ) => {
1818
return (
1919
<div>
2020
<h5>Request duration</h5>
21-
<pre>{duration} ms</pre>
21+
<pre className="microlight">{duration} ms</pre>
2222
</div>
2323
)
2424
}
@@ -75,7 +75,7 @@ export default class LiveResponse extends React.Component {
7575
{ url && <div>
7676
<h4>Request URL</h4>
7777
<div className="request-url">
78-
<pre>{url}</pre>
78+
<pre className="microlight">{url}</pre>
7979
</div>
8080
</div>
8181
}

src/core/components/response-body.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export default class ResponseBody extends React.PureComponent {
8787
bodyEl = <div><a href={ href } download={ download }>{ "Download file" }</a></div>
8888
}
8989
} else {
90-
bodyEl = <pre>Download headers detected but your browser does not support downloading binary via XHR (Blob).</pre>
90+
bodyEl = <pre className="microlight">Download headers detected but your browser does not support downloading binary via XHR (Blob).</pre>
9191
}
9292

9393
// Anything else (CORS)
@@ -123,7 +123,7 @@ export default class ResponseBody extends React.PureComponent {
123123

124124
// Audio
125125
} else if (/^audio\//i.test(contentType)) {
126-
bodyEl = <pre><audio controls><source src={ url } type={ contentType } /></audio></pre>
126+
bodyEl = <pre className="microlight"><audio controls><source src={ url } type={ contentType } /></audio></pre>
127127
} else if (typeof content === "string") {
128128
bodyEl = <HighlightCode downloadable fileName={`${downloadName}.txt`} value={ content } />
129129
} else if ( content.size > 0 ) {

src/style/_layout.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@
596596
}
597597
}
598598

599-
.opblock-body pre
599+
.opblock-body pre.microlight
600600
{
601601
font-size: 12px;
602602

test/mocha/components/live-response.jsx

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,11 @@ describe("<LiveResponse/>", function(){
4343
let response = fromJSOrdered({
4444
status: 200,
4545
url: "http://petstore.swagger.io/v2/pet/1",
46-
headers: {},
46+
headers: {
47+
"content-type": "application/xml"
48+
},
4749
text: "<response/>",
50+
duration: 50
4851
})
4952

5053
let mutatedRequestForSpy = createSpy().andReturn(mutatedRequest)
@@ -81,8 +84,20 @@ describe("<LiveResponse/>", function(){
8184
expect(curl.props().request).toBe(requests[test.expected.request])
8285

8386
const expectedUrl = requests[test.expected.request].get("url")
84-
expect(wrapper.find("div.request-url pre").text()).toEqual(expectedUrl)
87+
expect(wrapper.find("div.request-url pre.microlight").text()).toEqual(expectedUrl)
88+
89+
let duration = wrapper.find("Duration")
90+
expect(duration.length).toEqual(1)
91+
expect(duration.props().duration).toEqual(50)
92+
expect(duration.html())
93+
.toEqual("<div><h5>Request duration</h5><pre class=\"microlight\">50 ms</pre></div>")
8594

95+
let responseHeaders = wrapper.find("Headers")
96+
expect(duration.length).toEqual(1)
97+
expect(responseHeaders.props().headers.length).toEqual(1)
98+
expect(responseHeaders.props().headers[0].key).toEqual("content-type")
99+
expect(responseHeaders.html())
100+
.toEqual("<div><h5>Response headers</h5><pre class=\"microlight\"><span class=\"headerline\"> content-type: application/xml </span></pre></div>")
86101
})
87102
})
88103
})

0 commit comments

Comments
 (0)