Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop: Use dedicated indicator for non-ascii domain names Update dependency sinon-chai to v3 Update dependency semver to v7 Update dependency vue-router to v4.1.5 Update dependency eslint to v8.23.0 Update dependency vue-template-compiler to v2.7.10 Update dependency @vue/babel-helper-vue-jsx-merge-props to v1.4.0 Update dependency eslint-plugin-promise to v6.0.1 Remove isparta Update dependency @babel/core to v7.18.13
This commit is contained in:
commit
e9adee4517
25 changed files with 285 additions and 600 deletions
|
|
@ -17,11 +17,6 @@ const webpackConfig = merge(baseConfig, {
|
|||
rules: utils.styleLoaders()
|
||||
},
|
||||
devtool: 'inline-source-map',
|
||||
// vue: {
|
||||
// loaders: {
|
||||
// js: 'isparta'
|
||||
// }
|
||||
// },
|
||||
plugins: [
|
||||
new webpack.DefinePlugin({
|
||||
'process.env': require('../../config/test.env')
|
||||
|
|
@ -37,22 +32,6 @@ const webpackConfig = merge(baseConfig, {
|
|||
// no need for app entry during tests
|
||||
delete webpackConfig.entry
|
||||
|
||||
// make sure isparta loader is applied before eslint
|
||||
// webpackConfig.module.preLoaders = webpackConfig.module.preLoaders || []
|
||||
// webpackConfig.module.preLoaders.unshift({
|
||||
// test: /\.js$/,
|
||||
// loader: 'isparta',
|
||||
// include: path.resolve(projectRoot, 'src')
|
||||
// })
|
||||
|
||||
// // only apply babel for test files when using isparta
|
||||
// webpackConfig.module.loaders.some(function (loader, i) {
|
||||
// if (loader.loader === 'babel') {
|
||||
// loader.include = path.resolve(projectRoot, 'test/unit')
|
||||
// return true
|
||||
// }
|
||||
// })
|
||||
|
||||
module.exports = function (config) {
|
||||
config.set({
|
||||
// to run in additional browsers:
|
||||
|
|
|
|||
|
|
@ -269,7 +269,8 @@ describe('API Entities normalizer', () => {
|
|||
it('converts IDN to unicode and marks it as internatonal', () => {
|
||||
const user = makeMockUserMasto({ acct: 'lain@xn--lin-6cd.com' })
|
||||
|
||||
expect(parseUser(user)).to.have.property('screen_name_ui').that.equal('lain@🌏lаin.com')
|
||||
expect(parseUser(user)).to.have.property('screen_name_ui').that.equal('lain@lаin.com')
|
||||
expect(parseUser(user)).to.have.property('screen_name_ui_contains_non_ascii').that.equal(true)
|
||||
})
|
||||
})
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue