Просмотр исходного кода

tweaks to how tests are included

Adam Shaw 7 лет назад
Родитель
Сommit
9fbde6e465
5 измененных файлов с 3 добавлено и 7 удалено
  1. 0 4
      karma.config.js
  2. 0 1
      rollup.config.js
  3. 0 0
      tests/automated/global-defs.d.ts
  4. 2 1
      tests/automated/globals.js
  5. 1 1
      tsconfig.json

+ 0 - 4
karma.config.js

@@ -15,19 +15,15 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
 
-      // dependencies for main lib AND plugin
       'node_modules/superagent/superagent.js',
       'node_modules/moment/moment.js',
       'node_modules/moment/locale/es.js', // only spanish for testing
       'node_modules/moment-timezone/builds/moment-timezone-with-data.js',
       'node_modules/rrule/dist/es5/rrule.js',
       'node_modules/jquery/dist/jquery.js',
-
       'node_modules/components-jqueryui/jquery-ui.js',
       'node_modules/components-jqueryui/themes/cupertino/jquery-ui.css',
       { pattern: 'node_modules/components-jqueryui/themes/cupertino/images/**', included: false, nocache: true, watched: false },
-
-      // dependencies for tests
       'node_modules/native-promise-only/lib/npo.src.js', // Promises needed by xhr-mock
       'node_modules/xhr-mock/dist/xhr-mock.js', // TODO: should include this via require(), but .d.ts problems
       'node_modules/jasmine-jquery/lib/jasmine-jquery.js',

+ 0 - 1
rollup.config.js

@@ -130,7 +130,6 @@ function buildTestConfig() {
     watch: watchOptions,
     input: [
       'tmp/tsc-output/tests/automated/globals.js', // needs to be first
-      'tmp/tsc-output/tests/automated/hacks.js', // "
       'tmp/tsc-output/tests/automated/**/*.js'
     ],
     external: externalPackageNames,

+ 0 - 0
tests/automated/globals.d.ts → tests/automated/global-defs.d.ts


+ 2 - 1
tests/automated/globals.js

@@ -1,6 +1,7 @@
+import './hacks'
+import './lib/simulate'
 import { Calendar, globalDefaults } from 'fullcalendar'
 
-
 // Setup / Teardown
 // ---------------------------------------------------------------------------------------------------------------------
 

+ 1 - 1
tsconfig.json

@@ -37,7 +37,7 @@
   "include": [
     "src/*/main.ts",
     "locales/*.js",
-    "tests/automated/globals.d.ts",
+    "tests/automated/global-defs.d.ts",
     "tests/automated/**/*.js"
   ]
 }