Skip to content

Commit

Permalink
update karma test config πŸŽ— 🏑 πŸ™
Browse files Browse the repository at this point in the history
  • Loading branch information
ccforward committed Feb 24, 2017
1 parent 83d8e7e commit 625c311
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 19 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Not support Vue.js 1.x

[https://ccforward.github.io/rubik/](https://ccforward.github.io/rubik/)

[http://rubik.ccforward.net/](http://rubik.ccforward.net/)

## Usage

#### npm install
Expand Down
8 changes: 4 additions & 4 deletions demo/js/app.d1f51.js β†’ demo/js/app.84f56.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/js/manifest.dbdf0.js β†’ demo/js/manifest.9010e.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/views/About.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

<h2>Demo</h2>
<a class="demo demo-link" href="https://ccforward.github.io/rubik/" target="_blank">https://ccforward.github.io/rubik/</a>
<a class="demo demo-link" href="http://rubik.ccforward.net/" target="_blank">http://rubik.ccforward.net/</a>

<h2>使用</h2>
<p>
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-90254728-1', 'auto');ga('send', 'pageview');</script></head><body><a class="github-fork-ribbon right-top" target=_blank href=https://github.com/ccforward/rubik/ title="Fork me on GitHub">Fork me on GitHub</a><div id=app></div><script type=text/javascript src=./demo/js/manifest.dbdf0.js></script><script type=text/javascript src=./demo/js/vendor.c7f5f.js></script><script type=text/javascript src=./demo/js/app.d1f51.js></script></body></html>
ga('create', 'UA-90254728-1', 'auto');ga('send', 'pageview');</script></head><body><a class="github-fork-ribbon right-top" target=_blank href=https://github.com/ccforward/rubik/ title="Fork me on GitHub">Fork me on GitHub</a><div id=app></div><script type=text/javascript src=./demo/js/manifest.9010e.js></script><script type=text/javascript src=./demo/js/vendor.c7f5f.js></script><script type=text/javascript src=./demo/js/app.84f56.js></script></body></html>
8 changes: 1 addition & 7 deletions src/components/Form/Checkbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
<script>
export default {
name: 'checkbox',
// data () {
// return {
// model: null
// }
// },
props: {
label: {
Expand Down Expand Up @@ -62,7 +56,7 @@
this.$refs.checkbox.checked = true
if(this.selected && this.selected.indexOf(this.val) < 0)
this.selected.push(this.val)
}else if (this.selected && this.selected.includes(this.val) ) {
}else if (this.selected && this.selected.indexOf(this.val) >= 0 ) {
this.$refs.checkbox.checked = true
}
Expand Down
9 changes: 4 additions & 5 deletions test/unit/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ delete webpackConfig.entry;

module.exports = config => {
config.set({
// browsers: ['PhantomJS'],
browsers: ['Chrome'],
browsers: ['PhantomJS'],
// browsers: ['PhantomJS', 'Chrome'],

frameworks: ['mocha', 'sinon-chai'],

Expand All @@ -32,13 +32,12 @@ module.exports = config => {
'karma-coverage'
],

// reporters: ['spec', 'coverage'],

reporters: ['progress'],
reporters: ['spec', 'coverage', 'progress'],

coverageReporter: {
dir: './coverage',
reporters: [
{ type: 'html', subdir: 'report-html' },
{ type: 'lcov', subdir: '.' },
{ type: 'text-summary' }
]
Expand Down
1 change: 0 additions & 1 deletion test/unit/specs/tooltip.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ describe('Tooltip', () => {
const tt = document.querySelector('.tt-top')

expect(vm.$el.dataset.tooltip).to.be.equal(txt)
expect(getComputedStyle(tt, ':after').content.toString().replace(/"/g, '') == vm.$el.dataset.tooltip).to.be.true
done()
})
})
Expand Down

0 comments on commit 625c311

Please sign in to comment.