Skip to content

作业完成，提交主干道 #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chenwenqin wants to merge 4 commits into
base: master
Choose a base branch
from
Open

作业完成，提交主干道 #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4381069
作业完成
chenwenqin Mar 24, 2019
67ca225
删除没用的代码
chenwenqin Mar 24, 2019
fbf664e
测试travis CI
chenwenqin Mar 24, 2019
34bed8b
测试travis CI完成
chenwenqin Mar 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Karma configuration
// Generated on Fri Aug 04 2017 20:53:38 GMT+0800 (CST)
// Generated on Sat Mar 23 2019 13:44:54 GMT+0800 (中国标准时间)

module.exports = function(config) {
config.set({
Expand All @@ -15,10 +15,10 @@ module.exports = function(config) {

// list of files / patterns to load in the browser
files: [
'node_modules/should/should.js',
'js/*.js',
'quz/*.js',
'test/*.js'
'./node_modules/should/should.js',
'./quz/quz.js',
'./js/list.js',
'./test/**.js'
],


Expand Down Expand Up @@ -58,19 +58,12 @@ module.exports = function(config) {

// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ['Chrome_without_security'],

customLaunchers: {
Chrome_without_security: {
base: 'Chrome',
flags: ['--disable-web-security']
}
},
browsers: ['Chrome'],


// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: true,
singleRun: false,

// Concurrency level
// how many browser should be started simultaneous
Expand Down
Loading