mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-01-30 19:18:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Config values that come from plugins are now colored properly (… (#6036)

Browse Source 
Actual data is that the from value is `"plugin"` and not `"plugins"`
This commit is contained in:
Andrew Smith
2019-12-23 23:15:54 -05:00
committed by Jennifer Shehane
parent 9e0f32a4a5
commit ccbbbdd313
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/desktop-gui/cypress/fixtures/config.json
View File

@@ -196,7 +196,7 @@
"value": "http://localhost:8080"
},
"browsers": {
"from": "plugins",
"from": "plugin",
"value": [
{
"name": "chrome",

10
packages/desktop-gui/cypress/integration/settings_spec.js
View File

@@ -109,16 +109,16 @@ describe('Settings', () => {
it('applies the same color treatment to expanded key values as the root key', () => {
cy.contains('span', 'browsers').parents('div').first().find('span').first().click()
cy.get('.config-vars').as('config-vars')
.contains('span', 'Chrome').parent('span').should('have.class', 'plugins')
.contains('span', 'Chrome').parent('span').should('have.class', 'plugin')
cy.get('@config-vars')
.contains('span', 'Chromium').parent('span').should('have.class', 'plugins')
.contains('span', 'Chromium').parent('span').should('have.class', 'plugin')
cy.get('@config-vars')
.contains('span', 'Canary').parent('span').should('have.class', 'plugins')
.contains('span', 'Canary').parent('span').should('have.class', 'plugin')
cy.get('@config-vars')
.contains('span', 'Electron').parent('span').should('have.class', 'plugins')
.contains('span', 'Electron').parent('span').should('have.class', 'plugin')
cy.contains('span', 'blacklistHosts').parents('div').first().find('span').first().click()
cy.get('@config-vars')
@@ -137,7 +137,7 @@ describe('Settings', () => {
cy.get('@config-vars')
.contains('span', 'Electron').parents('div').first().find('span').first().click()
cy.get('@config-vars').contains('span', 'electron').parents('li').eq(1).find('.line .plugins').should('have.length', 6)
cy.get('@config-vars').contains('span', 'electron').parents('li').eq(1).find('.line .plugin').should('have.length', 6)
})
it('displays string values as quoted strings', () => {

2
packages/desktop-gui/src/settings/configuration.jsx
View File

@@ -174,7 +174,7 @@ const Configuration = observer(({ project }) => (
<td>set from CLI arguments</td>
</tr>
<tr className='config-keys'>
<td><span className='plugins'>plugin</span></td>
<td><span className='plugin'>plugin</span></td>
<td>set from plugin file</td>
</tr>
</tbody>

4
packages/desktop-gui/src/settings/settings.scss
View File

@@ -100,7 +100,7 @@
}
}
.envFile, .env, .config, .cli, .plugins, .default {
.envFile, .env, .config, .cli, .plugin, .default {
font-family: $font-mono;
padding: 2px;
}
@@ -125,7 +125,7 @@
color: #A21313;
}
.plugins {
.plugin {
background-color: #f0e7fc;
color: #134aa2;
}