From 591f9c3d872d78ed86d578dc1ae07bb4b14c7704 Mon Sep 17 00:00:00 2001
From: zhangke <zhangke>
Date: Sun, 24 Mar 2019 10:26:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?karma=20=E6=B5=8B=E8=AF=95=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 karma.conf.js | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++
 test/test.js  |  7 +++++
 2 files changed, 78 insertions(+)
 create mode 100644 karma.conf.js

diff --git a/karma.conf.js b/karma.conf.js
new file mode 100644
index 00000000..b8c6d421
--- /dev/null
+++ b/karma.conf.js
@@ -0,0 +1,71 @@
+// Karma configuration
+// Generated on Sun Mar 24 2019 10:23:23 GMT+0800 (GMT+08:00)
+
+module.exports = function(config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['mocha'],
+
+
+    // list of files / patterns to load in the browser
+    files: [
+      'https://cdn.bootcss.com/jquery/2.2.4/jquery.js',
+      'node_modules/should/should.js',
+      'test/**.js'
+    ],
+
+
+    // list of files / patterns to exclude
+    exclude: [
+    ],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['Chrome'],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: false,
+
+    // Concurrency level
+    // how many browser should be started simultaneous
+    concurrency: Infinity
+  })
+}
diff --git a/test/test.js b/test/test.js
index 7c01938c..f16c0a4e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -32,5 +32,12 @@ describe('jQuery', function () {
 
   it('should able to request https://raw.githubusercontent.com/FE-star/exercise1/master/test/test.js', function (done) {
     // 使用 jQuery.ajax 请求 https://raw.githubusercontent.com/FE-star/exercise1/master/test/test.js，并验证是否拿到文件
+    window.jQuery.ajax({  
+      url: 'https://raw.githubusercontent.com/FE-star/exercise1/master/test/test.js',
+      type: 'GET',
+      success: function () {
+        done();
+        }
+    })
   })
 })
\ No newline at end of file

From 4dbd7387e3bf9e12a1cc659a3ffdf4e8cee166ee Mon Sep 17 00:00:00 2001
From: zhangke <zhangke>
Date: Sun, 24 Mar 2019 11:19:46 +0800
Subject: [PATCH 2/3] add .trabis.yml

---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..64dd7fba
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,7 @@
+language: node_js
+node_js:
+- "10.12.0"
+before_install:
+- npm install -g mocha
+install: npm install
+script: karma start 
\ No newline at end of file

From 683cee14a7c1f43a3c56b7a06b32c89c2d8bdc1b Mon Sep 17 00:00:00 2001
From: zhangke <zhangke>
Date: Sun, 24 Mar 2019 11:33:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20.travis.yml=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64dd7fba..2eb63d08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: node_js
 node_js:
 - "10.12.0"
 before_install:
-- npm install -g mocha
+  - export CHROME_BIN=chromium-browser
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
 install: npm install
-script: karma start 
\ No newline at end of file
+script: karma start karma.conf.js --single-run 
\ No newline at end of file