archive-gh-me/tailwindcss
1
0
Fork 0
mirror of https://github.com/tailwindlabs/tailwindcss.git synced 2025-12-08 21:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix style

Browse Source
This commit is contained in:
Adam Wathan 2017-11-24 12:39:27 -05:00
parent d28aa3c73a
commit 6b307cd8af
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
__tests__/customConfig.test.js
View File

@ -4,13 +4,15 @@ import tailwind from '../src/index'
test('it uses the values from the custom config file', () => {
return postcss([tailwind(path.resolve(`${__dirname}/fixtures/customConfig.js`))])
.process(`
.process(
`
@responsive {
.foo {
color: blue;
}
}
`)
`
)
.then(result => {
const expected = `
.foo {

6
__tests__/fixtures/customConfig.js
View File

@ -1,5 +1,5 @@
module.exports = {
screens: {
mobile: '400px',
}
screens: {
mobile: '400px',
},
}

46
__tests__/mergeConfigWithDefaults.test.js
View File

@ -2,66 +2,66 @@ import mergeConfigWithDefaults from '../src/util/mergeConfigWithDefaults'
test('missing top level keys are pulled from the default config', () => {
const userConfig = {
colors: { red: '#ff0000' },
modules: {},
options: {},
colors: { red: '#ff0000' },
modules: {},
options: {},
}
const defaultConfig = {
colors: { green: '#00ff00' },
colors: { green: '#00ff00' },
screens: {
sm: '576px'
sm: '576px',
},
modules: {},
options: {},
modules: {},
options: {},
}
const result = mergeConfigWithDefaults(userConfig, defaultConfig)
expect(result).toEqual({
colors: { red: '#ff0000' },
colors: { red: '#ff0000' },
screens: {
sm: '576px'
sm: '576px',
},
modules: {},
options: {},
modules: {},
options: {},
})
})
test('user modules are merged with default modules', () => {
const userConfig = {
modules: { flexbox: false },
options: {},
modules: { flexbox: false },
options: {},
}
const defaultConfig = {
modules: {
modules: {
flexbox: ['responsive'],
textAlign: ['responsive'],
},
options: {},
options: {},
}
const result = mergeConfigWithDefaults(userConfig, defaultConfig)
expect(result).toEqual({
modules: {
modules: {
flexbox: false,
textAlign: ['responsive'],
},
options: {},
options: {},
})
})
test('user options are merged with default options', () => {
const userConfig = {
modules: {},
options: { prefix: 'tw-' },
modules: {},
options: { prefix: 'tw-' },
}
const defaultConfig = {
modules: {},
options: {
modules: {},
options: {
prefix: '-',
important: false,
},
@ -70,8 +70,8 @@ test('user options are merged with default options', () => {
const result = mergeConfigWithDefaults(userConfig, defaultConfig)
expect(result).toEqual({
modules: {},
options: {
modules: {},
options: {
prefix: 'tw-',
important: false,
},