return to the original file structure to avoid breaking modularity

diff --git a/build/build-plugins.js b/build/build-plugins.js
index 7aa2a4e5291a700f8cf0be2759f5eb955a75055a..bf64021de34312d6c82796b8ce8be60e9c79672d 100644 (file)
--- a/build/build-plugins.js
+++ b/build/build-plugins.js
@@ -32,19 +32,19 @@ const bsPlugins = {
   Manipulator: path.resolve(__dirname, '../js/src/dom/manipulator.js'),
   Polyfill: path.resolve(__dirname, '../js/src/dom/polyfill.js'),
   SelectorEngine: path.resolve(__dirname, '../js/src/dom/selector-engine.js'),
-  Alert: path.resolve(__dirname, '../js/src/alert/alert.js'),
-  Button: path.resolve(__dirname, '../js/src/button/button.js'),
-  Carousel: path.resolve(__dirname, '../js/src/carousel/carousel.js'),
-  Collapse: path.resolve(__dirname, '../js/src/collapse/collapse.js'),
-  Dropdown: path.resolve(__dirname, '../js/src/dropdown/dropdown.js'),
-  Modal: path.resolve(__dirname, '../js/src/modal/modal.js'),
-  Popover: path.resolve(__dirname, '../js/src/popover/popover.js'),
-  ScrollSpy: path.resolve(__dirname, '../js/src/scrollspy/scrollspy.js'),
-  Tab: path.resolve(__dirname, '../js/src/tab/tab.js'),
-  Toast: path.resolve(__dirname, '../js/src/toast/toast.js'),
-  Tooltip: path.resolve(__dirname, '../js/src/tooltip/tooltip.js')
+  Alert: path.resolve(__dirname, '../js/src/alert.js'),
+  Button: path.resolve(__dirname, '../js/src/button.js'),
+  Carousel: path.resolve(__dirname, '../js/src/carousel.js'),
+  Collapse: path.resolve(__dirname, '../js/src/collapse.js'),
+  Dropdown: path.resolve(__dirname, '../js/src/dropdown.js'),
+  Modal: path.resolve(__dirname, '../js/src/modal.js'),
+  Popover: path.resolve(__dirname, '../js/src/popover.js'),
+  ScrollSpy: path.resolve(__dirname, '../js/src/scrollspy.js'),
+  Tab: path.resolve(__dirname, '../js/src/tab.js'),
+  Toast: path.resolve(__dirname, '../js/src/toast.js'),
+  Tooltip: path.resolve(__dirname, '../js/src/tooltip.js')
 }
-const rootPath = '../js/dist/'
+const rootPath = path.resolve(__dirname, '../js/dist/')
 
 const defaultPluginConfig = {
   external: [
@@ -172,7 +172,7 @@ function build(plugin) {
       name: plugin,
       sourcemap: true,
       globals,
-      file: path.resolve(__dirname, `${pluginPath}${pluginFilename}`)
+      file: path.resolve(__dirname, `${pluginPath}/${pluginFilename}`)
     })
       .then(() => console.log(`Building ${plugin} plugin... Done!`))
       .catch(error => console.error(`${plugin}: ${error}`))

diff --git a/js/index.esm.js b/js/index.esm.js
index 18b12a454f3c10e9228d0f91e9bbcbdab210ac59..e49218a1e811d4e838cfee677b8c15d2d342a823 100644 (file)
--- a/js/index.esm.js
+++ b/js/index.esm.js
@@ -5,17 +5,17 @@
  * --------------------------------------------------------------------------
  */
 
-import Alert from './src/alert/alert'
-import Button from './src/button/button'
-import Carousel from './src/carousel/carousel'
-import Collapse from './src/collapse/collapse'
-import Dropdown from './src/dropdown/dropdown'
-import Modal from './src/modal/modal'
-import Popover from './src/popover/popover'
-import ScrollSpy from './src/scrollspy/scrollspy'
-import Tab from './src/tab/tab'
-import Toast from './src/toast/toast'
-import Tooltip from './src/tooltip/tooltip'
+import Alert from './src/alert'
+import Button from './src/button'
+import Carousel from './src/carousel'
+import Collapse from './src/collapse'
+import Dropdown from './src/dropdown'
+import Modal from './src/modal'
+import Popover from './src/popover'
+import ScrollSpy from './src/scrollspy'
+import Tab from './src/tab'
+import Toast from './src/toast'
+import Tooltip from './src/tooltip'
 
 export {
   Alert,

diff --git a/js/index.umd.js b/js/index.umd.js
index 17657f38f8ed6e3a3c670a67055ec21b718c41d3..0a1d5ac0b401f6d3014e0bf75b5c7520a0595ca4 100644 (file)
--- a/js/index.umd.js
+++ b/js/index.umd.js
@@ -5,17 +5,17 @@
  * --------------------------------------------------------------------------
  */
 
-import Alert from './src/alert/alert'
-import Button from './src/button/button'
-import Carousel from './src/carousel/carousel'
-import Collapse from './src/collapse/collapse'
-import Dropdown from './src/dropdown/dropdown'
-import Modal from './src/modal/modal'
-import Popover from './src/popover/popover'
-import ScrollSpy from './src/scrollspy/scrollspy'
-import Tab from './src/tab/tab'
-import Toast from './src/toast/toast'
-import Tooltip from './src/tooltip/tooltip'
+import Alert from './src/alert'
+import Button from './src/button'
+import Carousel from './src/carousel'
+import Collapse from './src/collapse'
+import Dropdown from './src/dropdown'
+import Modal from './src/modal'
+import Popover from './src/popover'
+import ScrollSpy from './src/scrollspy'
+import Tab from './src/tab'
+import Toast from './src/toast'
+import Tooltip from './src/tooltip'
 
 export default {
   Alert,

diff --git a/js/src/alert/alert.js b/js/src/alert.js
similarity index 96%
rename from js/src/alert/alert.js
rename to js/src/alert.js
index 024528b8168673e216ace606b926c879cd6480fe..dbd931b52e6b80acb18ff4b85e8d4299d2d39d3f 100644 (file)
--- a/js/src/alert/alert.js
+++ b/js/src/alert.js
@@ -11,10 +11,10 @@ import {
   emulateTransitionEnd,
   getElementFromSelector,
   getTransitionDurationFromElement
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/button/button.js b/js/src/button.js
similarity index 96%
rename from js/src/button/button.js
rename to js/src/button.js
index 4418ba6b8703d53679a947666d6041e76298d427..6edd5cb64f6826bed73031cd8d0d9d71bc5b52b6 100644 (file)
--- a/js/src/button/button.js
+++ b/js/src/button.js
@@ -5,10 +5,10 @@
  * --------------------------------------------------------------------------
  */
 
-import { getjQuery } from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import SelectorEngine from '../dom/selector-engine'
+import { getjQuery } from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/carousel/carousel.js b/js/src/carousel.js
similarity index 98%
rename from js/src/carousel/carousel.js
rename to js/src/carousel.js
index 723bf57c6618ef218987747d5855d5d92e8420e5..5034f1798485bef2fae90c143432f7a7e33f988b 100644 (file)
--- a/js/src/carousel/carousel.js
+++ b/js/src/carousel.js
@@ -16,11 +16,11 @@ import {
   reflow,
   triggerTransitionEnd,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/collapse/collapse.js b/js/src/collapse.js
similarity index 98%
rename from js/src/collapse/collapse.js
rename to js/src/collapse.js
index 4de7b528224aaa9c3f76a6198ddbcb698bacf35c..f533885ec46ebb940bb85934eb07b341d957cfc5 100644 (file)
--- a/js/src/collapse/collapse.js
+++ b/js/src/collapse.js
@@ -16,11 +16,11 @@ import {
   makeArray,
   reflow,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/dropdown/dropdown.js b/js/src/dropdown.js
similarity index 98%
rename from js/src/dropdown/dropdown.js
rename to js/src/dropdown.js
index b8403568929b80c42b9856692e9fc8d9e6574d49..06a271ef8343947298b404b9c9737c059784d52a 100644 (file)
--- a/js/src/dropdown/dropdown.js
+++ b/js/src/dropdown.js
@@ -12,12 +12,12 @@ import {
   makeArray,
   noop,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
 import Popper from 'popper.js'
-import SelectorEngine from '../dom/selector-engine'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/modal/modal.js b/js/src/modal.js
similarity index 98%
rename from js/src/modal/modal.js
rename to js/src/modal.js
index 4864cad9d04e40e038f9762b2125a46dad8e661e..bee5e23f88a47aba00b8c521370f9134c7f94b87 100644 (file)
--- a/js/src/modal/modal.js
+++ b/js/src/modal.js
@@ -15,11 +15,11 @@ import {
   makeArray,
   reflow,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/popover/popover.js b/js/src/popover.js
similarity index 96%
rename from js/src/popover/popover.js
rename to js/src/popover.js
index 5da7ffe562588de908e931c94d63fcdb80c69890..a633af4ba0b9325eea0ccd215d90ab7864ae2928 100644 (file)
--- a/js/src/popover/popover.js
+++ b/js/src/popover.js
@@ -5,10 +5,10 @@
  * --------------------------------------------------------------------------
  */
 
-import { getjQuery } from '../util/index'
-import Data from '../dom/data'
-import SelectorEngine from '../dom/selector-engine'
-import Tooltip from '../tooltip/tooltip'
+import { getjQuery } from './util/index'
+import Data from './dom/data'
+import SelectorEngine from './dom/selector-engine'
+import Tooltip from './tooltip'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/scrollspy/scrollspy.js b/js/src/scrollspy.js
similarity index 97%
rename from js/src/scrollspy/scrollspy.js
rename to js/src/scrollspy.js
index fa52a128904d3f01f0c8c6c2deda404c6c81ee15..c379c62235b00acfb5820bd2ec2c5c5c5248a041 100644 (file)
--- a/js/src/scrollspy/scrollspy.js
+++ b/js/src/scrollspy.js
@@ -11,11 +11,11 @@ import {
   getUID,
   makeArray,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/tab/tab.js b/js/src/tab.js
similarity index 97%
rename from js/src/tab/tab.js
rename to js/src/tab.js
index b356cc0e2bfe0b7faa4e1dadd110cf19c3761b29..d9bd1fc050ea7affe5d0fba69e8cee33c2b23c02 100644 (file)
--- a/js/src/tab/tab.js
+++ b/js/src/tab.js
@@ -13,10 +13,10 @@ import {
   getTransitionDurationFromElement,
   makeArray,
   reflow
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/toast/toast.js b/js/src/toast.js
similarity index 97%
rename from js/src/toast/toast.js
rename to js/src/toast.js
index 4de7db1cd18c30b580cbd36a750019734657312b..e0d2a8b3f2d9064cc58b71ef0d167d397e24df06 100644 (file)
--- a/js/src/toast/toast.js
+++ b/js/src/toast.js
@@ -12,10 +12,10 @@ import {
   getTransitionDurationFromElement,
   reflow,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/tooltip/tooltip.js b/js/src/tooltip.js
similarity index 98%
rename from js/src/tooltip/tooltip.js
rename to js/src/tooltip.js
index 99ac29af6fa32f38be3f36da345c409a4caf3997..b4f047b70ef2174ca1afe0587d8d8253f86f1e82 100644 (file)
--- a/js/src/tooltip/tooltip.js
+++ b/js/src/tooltip.js
@@ -16,16 +16,16 @@ import {
   makeArray,
   noop,
   typeCheckConfig
-} from '../util/index'
+} from './util/index'
 import {
   DefaultWhitelist,
   sanitizeHtml
-} from '../util/sanitizer'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
+} from './util/sanitizer'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
 import Popper from 'popper.js'
-import SelectorEngine from '../dom/selector-engine'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/tests/README.md b/js/tests/README.md
index 76a582e8557e87ce1d7db5916c3476a96aecfb8e..dd2cc0f1b98448924a7237fae48f682f70bcaba0 100644 (file)
--- a/js/tests/README.md
+++ b/js/tests/README.md
@@ -1,6 +1,6 @@
 ## How does Bootstrap's test suite work?
 
-Bootstrap uses [Jasmine](https://jasmine.github.io/). Each plugin has a file dedicated to its tests in `src/<plugin-name>/<plugin-name>.spec.js`.
+Bootstrap uses [Jasmine](https://jasmine.github.io/). Each plugin has a file dedicated to its tests in `tests/units/<plugin-name>.spec.js`.
 
 * `visual/` contains "visual" tests which are run interactively in real browsers and require manual verification by humans.
 
@@ -9,7 +9,7 @@ To run the unit test suite via [Karma](https://karma-runner.github.io/) and debu
 
 ## How do I add a new unit test?
 
-1. Locate and open the file dedicated to the plugin which you need to add tests to (`src/<plugin-name>/<plugin-name>.spec.js`).
+1. Locate and open the file dedicated to the plugin which you need to add tests to (`tests/units/<plugin-name>.spec.js`).
 2. Review the [Jasmine API Documentation](https://jasmine.github.io/pages/docs_home.html) and use the existing tests as references for how to structure your new tests.
 3. Write the necessary unit test(s) for the new or revised functionality.
 4. Run `npm run js-test` to see the results of your newly-added test(s).
@@ -26,7 +26,7 @@ To run the unit test suite via [Karma](https://karma-runner.github.io/) and debu
 
 ## Code coverage
 
-Currently we're aiming for at least 90% test coverage for our code. To ensure your changes meet or exceed this limit, run `npm run js-compile && npm run js-test` and open the file in `js/coverage/lcov-report/index.html` to see the code coverage for each plugin. See more details when you select a plugin and ensure your change is fully covered by unit tests.
+Currently we're aiming for at least 90% test coverage for our code. To ensure your changes meet or exceed this limit, run `npm run js-test-karma` and open the file in `js/coverage/lcov-report/index.html` to see the code coverage for each plugin. See more details when you select a plugin and ensure your change is fully covered by unit tests.
 
 ### Example tests
 

diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index 06c594bcebcafb7a72e81337829a86f1e232a778..8e3009410473c6aec5863be17f7f28181bc32939 100644 (file)
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -46,39 +46,6 @@ const customLaunchers = {
   }
 }
 
-const rollupPreprocessor = {
-  plugins: [
-    istanbul({
-      exclude: ['js/src/**/*.spec.js']
-    }),
-    babel({
-      // Only transpile our source code
-      exclude: 'node_modules/**',
-      // Include only required helpers
-      externalHelpersWhitelist: [
-        'defineProperties',
-        'createClass',
-        'inheritsLoose',
-        'defineProperty',
-        'objectSpread2'
-      ],
-      plugins: [
-        '@babel/plugin-proposal-object-rest-spread'
-      ]
-    }),
-    resolve()
-  ],
-  output: {
-    format: 'iife',
-    name: 'bootstrapTest',
-    sourcemap: 'inline'
-  }
-}
-
-let files = [
-  'node_modules/hammer-simulator/index.js'
-]
-
 const conf = {
   basePath: '../..',
   port: 9876,
@@ -88,6 +55,41 @@ const conf = {
   concurrency: Infinity,
   client: {
     clearContext: false
+  },
+  files: [
+    'node_modules/hammer-simulator/index.js',
+    { pattern: 'js/tests/units/**/*.spec.js', watched: !browserStack }
+  ],
+  preprocessors: {
+    'js/tests/units/**/*.spec.js': ['rollup']
+  },
+  rollupPreprocessor: {
+    plugins: [
+      istanbul({
+        exclude: ['js/tests/units/**/*.spec.js', 'js/tests/helpers/**/*.js']
+      }),
+      babel({
+        // Only transpile our source code
+        exclude: 'node_modules/**',
+        // Include only required helpers
+        externalHelpersWhitelist: [
+          'defineProperties',
+          'createClass',
+          'inheritsLoose',
+          'defineProperty',
+          'objectSpread2'
+        ],
+        plugins: [
+          '@babel/plugin-proposal-object-rest-spread'
+        ]
+      }),
+      resolve()
+    ],
+    output: {
+      format: 'iife',
+      name: 'bootstrapTest',
+      sourcemap: 'inline'
+    }
   }
 }
 
@@ -104,13 +106,6 @@ if (browserStack) {
   conf.customLaunchers = browsers
   conf.browsers = browsersKeys
   reporters.push('BrowserStack', 'kjhtml')
-  files = files.concat([
-    { pattern: 'js/src/**/*.spec.js', watched: false }
-  ])
-  conf.preprocessors = {
-    'js/src/**/*.spec.js': ['rollup']
-  }
-  conf.rollupPreprocessor = rollupPreprocessor
 } else {
   frameworks.push('detectBrowsers')
   plugins.push(
@@ -119,14 +114,7 @@ if (browserStack) {
     'karma-detect-browsers',
     'karma-coverage-istanbul-reporter'
   )
-  files = files.concat([
-    { pattern: 'js/src/**/*.spec.js', watched: true }
-  ])
   reporters.push('coverage-istanbul')
-  conf.preprocessors = {
-    'js/src/**/*.spec.js': ['rollup']
-  }
-  conf.rollupPreprocessor = rollupPreprocessor
   conf.customLaunchers = customLaunchers
   conf.detectBrowsers = detectBrowsers
   conf.coverageIstanbulReporter = {
@@ -165,7 +153,6 @@ if (browserStack) {
 conf.frameworks = frameworks
 conf.plugins = plugins
 conf.reporters = reporters
-conf.files = files
 
 module.exports = karmaConfig => {
   // possible values: karmaConfig.LOG_DISABLE || karmaConfig.LOG_ERROR || karmaConfig.LOG_WARN || karmaConfig.LOG_INFO || karmaConfig.LOG_DEBUG

diff --git a/js/src/.eslintrc.json b/js/tests/units/.eslintrc.json
similarity index 83%
rename from js/src/.eslintrc.json
rename to js/tests/units/.eslintrc.json
index 18ffdc003db9dbba4f523b1f8bb99d4ddcca304b..a8c1a6ae3427a6fd081d058ef4434e1930977b16 100644 (file)
--- a/js/src/.eslintrc.json
+++ b/js/tests/units/.eslintrc.json
@@ -1,7 +1,7 @@
 {
   "root": true,
   "extends": [
-    "../../.eslintrc.json"
+    "../../../.eslintrc.json"
   ],
   "overrides": [
     {

diff --git a/js/src/alert/alert.spec.js b/js/tests/units/alert.spec.js
similarity index 97%
rename from js/src/alert/alert.spec.js
rename to js/tests/units/alert.spec.js
index 61d656bd0c96151e2f29a16847b8150646747df8..32f11b618850853ba5b1ce397d715af109bd086b 100644 (file)
--- a/js/src/alert/alert.spec.js
+++ b/js/tests/units/alert.spec.js
@@ -1,8 +1,8 @@
-import Alert from './alert'
-import { makeArray, getTransitionDurationFromElement } from '../util/index'
+import Alert from '../../src/alert'
+import { makeArray, getTransitionDurationFromElement } from '../../src/util/index'
 
 /** Test helpers */
-import { getFixture, clearFixture, jQueryMock } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Alert', () => {
   let fixtureEl

diff --git a/js/src/button/button.spec.js b/js/tests/units/button.spec.js
similarity index 98%
rename from js/src/button/button.spec.js
rename to js/tests/units/button.spec.js
index 6228811854edd5642b694ad47d8cf00cff052d14..a3c95be1ba776da5251a73ec8e06aed6709798e3 100644 (file)
--- a/js/src/button/button.spec.js
+++ b/js/tests/units/button.spec.js
@@ -1,5 +1,5 @@
-import Button from './button'
-import EventHandler from '../dom/event-handler'
+import Button from '../../src/button'
+import EventHandler from '../../src/dom/event-handler'
 
 /** Test helpers */
 import {
@@ -7,7 +7,7 @@ import {
   clearFixture,
   createEvent,
   jQueryMock
-} from '../../tests/helpers/fixture'
+} from '../helpers/fixture'
 
 describe('Button', () => {
   let fixtureEl

diff --git a/js/src/carousel/carousel.spec.js b/js/tests/units/carousel.spec.js
similarity index 99%
rename from js/src/carousel/carousel.spec.js
rename to js/tests/units/carousel.spec.js
index 4c13b6d227c3bd91d6f07b966067d08573198a91..a163f9ae41e0cc4d7ad5ed9a7a719d90a14895f4 100644 (file)
--- a/js/src/carousel/carousel.spec.js
+++ b/js/tests/units/carousel.spec.js
@@ -1,8 +1,8 @@
-import Carousel from './carousel'
-import EventHandler from '../dom/event-handler'
+import Carousel from '../../src/carousel'
+import EventHandler from '../../src/dom/event-handler'
 
 /** Test helpers */
-import { getFixture, clearFixture, createEvent, jQueryMock } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture, createEvent, jQueryMock } from '../helpers/fixture'
 
 describe('Carousel', () => {
   const { Simulator, PointerEvent, MSPointerEvent } = window

diff --git a/js/src/collapse/collapse.spec.js b/js/tests/units/collapse.spec.js
similarity index 99%
rename from js/src/collapse/collapse.spec.js
rename to js/tests/units/collapse.spec.js
index 154bc2c6bb629657a73a5521d56de610df885818..3122ae6f4bcee35c5cd07942b300484d8b33d813 100644 (file)
--- a/js/src/collapse/collapse.spec.js
+++ b/js/tests/units/collapse.spec.js
@@ -1,9 +1,9 @@
-import Collapse from './collapse'
-import EventHandler from '../dom/event-handler'
-import { makeArray } from '../util/index'
+import Collapse from '../../src/collapse'
+import EventHandler from '../../src/dom/event-handler'
+import { makeArray } from '../../src/util/index'
 
 /** Test helpers */
-import { getFixture, clearFixture, jQueryMock } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Collapse', () => {
   let fixtureEl

diff --git a/js/src/dom/data.spec.js b/js/tests/units/dom/data.spec.js
similarity index 96%
rename from js/src/dom/data.spec.js
rename to js/tests/units/dom/data.spec.js
index 46018dd5ca7d2ce21cd651b8de9038a35fcd0db1..ab3240b9bb82afb2157ae19e01bab33e2e2d3296 100644 (file)
--- a/js/src/dom/data.spec.js
+++ b/js/tests/units/dom/data.spec.js
@@ -1,7 +1,7 @@
-import Data from './data'
+import Data from '../../../src/dom/data'
 
 /** Test helpers */
-import { getFixture, clearFixture } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture } from '../../helpers/fixture'
 
 describe('Data', () => {
   let fixtureEl

diff --git a/js/src/dom/event-handler.spec.js b/js/tests/units/dom/event-handler.spec.js
similarity index 98%
rename from js/src/dom/event-handler.spec.js
rename to js/tests/units/dom/event-handler.spec.js
index dc5c5c30ce536bf04d012a31019d97fd8b4f8fd0..5551ddaa30f78cbb725838a8986afa7b0c5cd82d 100644 (file)
--- a/js/src/dom/event-handler.spec.js
+++ b/js/tests/units/dom/event-handler.spec.js
@@ -1,7 +1,7 @@
-import EventHandler from './event-handler'
+import EventHandler from '../../../src/dom/event-handler'
 
 /** Test helpers */
-import { getFixture, clearFixture } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture } from '../../helpers/fixture'
 
 describe('EventHandler', () => {
   let fixtureEl

diff --git a/js/src/dom/manipulator.spec.js b/js/tests/units/dom/manipulator.spec.js
similarity index 97%
rename from js/src/dom/manipulator.spec.js
rename to js/tests/units/dom/manipulator.spec.js
index e96c068d44af0e8d75712e0cac6cdb40117600dc..986f6929804280a98fbd399ebf7266f0974d8d04 100644 (file)
--- a/js/src/dom/manipulator.spec.js
+++ b/js/tests/units/dom/manipulator.spec.js
@@ -1,7 +1,7 @@
-import Manipulator from './manipulator'
+import Manipulator from '../../../src/dom/manipulator'
 
 /** Test helpers */
-import { getFixture, clearFixture } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture } from '../../helpers/fixture'
 
 describe('Manipulator', () => {
   let fixtureEl

diff --git a/js/src/dom/selector-engine.spec.js b/js/tests/units/dom/selector-engine.spec.js
similarity index 94%
rename from js/src/dom/selector-engine.spec.js
rename to js/tests/units/dom/selector-engine.spec.js
index 28ccdf40b1a3f21275bb8a6d0800d92254128935..e13438e6fdf3bdb9fb0d283b4450248d31872551 100644 (file)
--- a/js/src/dom/selector-engine.spec.js
+++ b/js/tests/units/dom/selector-engine.spec.js
@@ -1,8 +1,8 @@
-import SelectorEngine from './selector-engine'
-import { makeArray } from '../util/index'
+import SelectorEngine from '../../../src/dom/selector-engine'
+import { makeArray } from '../../../src/util/index'
 
 /** Test helpers */
-import { getFixture, clearFixture } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture } from '../../helpers/fixture'
 
 describe('SelectorEngine', () => {
   let fixtureEl

diff --git a/js/src/dropdown/dropdown.spec.js b/js/tests/units/dropdown.spec.js
similarity index 99%
rename from js/src/dropdown/dropdown.spec.js
rename to js/tests/units/dropdown.spec.js
index 46374453c15cca5a162b68b91f7efea185572f05..0046cf6809adac1b0d885d54c064eabbc1d7138e 100644 (file)
--- a/js/src/dropdown/dropdown.spec.js
+++ b/js/tests/units/dropdown.spec.js
@@ -1,10 +1,10 @@
 import Popper from 'popper.js'
 
-import Dropdown from './dropdown'
-import EventHandler from '../dom/event-handler'
+import Dropdown from '../../src/dropdown'
+import EventHandler from '../../src/dom/event-handler'
 
 /** Test helpers */
-import { getFixture, clearFixture, createEvent, jQueryMock } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture, createEvent, jQueryMock } from '../helpers/fixture'
 
 describe('Dropdown', () => {
   let fixtureEl

diff --git a/js/src/modal/modal.spec.js b/js/tests/units/modal.spec.js
similarity index 99%
rename from js/src/modal/modal.spec.js
rename to js/tests/units/modal.spec.js
index 292f61f8bc241e177ecf7a9211036b2334acdb94..604934785ae2d9a2f8a998ecf048e732f86b333a 100644 (file)
--- a/js/src/modal/modal.spec.js
+++ b/js/tests/units/modal.spec.js
@@ -1,9 +1,9 @@
-import Modal from './modal'
-import EventHandler from '../dom/event-handler'
-import { makeArray } from '../util/index'
+import Modal from '../../src/modal'
+import EventHandler from '../../src/dom/event-handler'
+import { makeArray } from '../../src/util/index'
 
 /** Test helpers */
-import { getFixture, clearFixture, createEvent, jQueryMock } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture, createEvent, jQueryMock } from '../helpers/fixture'
 
 describe('Modal', () => {
   let fixtureEl

diff --git a/js/src/popover/popover.spec.js b/js/tests/units/popover.spec.js
similarity index 97%
rename from js/src/popover/popover.spec.js
rename to js/tests/units/popover.spec.js
index cf82e36ef19265693fc32e2fc8f7f3a0709ac76d..1c6cd389c9eee323aec7aa0171aa81f6c2374cd1 100644 (file)
--- a/js/src/popover/popover.spec.js
+++ b/js/tests/units/popover.spec.js
@@ -1,8 +1,8 @@
-import Popover from './popover'
-import { makeArray } from '../util/index'
+import Popover from '../../src/popover'
+import { makeArray } from '../../src/util/index'
 
 /** Test helpers */
-import { getFixture, clearFixture, jQueryMock } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Popover', () => {
   let fixtureEl

diff --git a/js/src/scrollspy/scrollspy.spec.js b/js/tests/units/scrollspy.spec.js
similarity index 99%
rename from js/src/scrollspy/scrollspy.spec.js
rename to js/tests/units/scrollspy.spec.js
index a019a6d1af29451201a05434b5ade6ad8f59dc84..9ac02ce99fb79eac75535d567fc2254199bbac24 100644 (file)
--- a/js/src/scrollspy/scrollspy.spec.js
+++ b/js/tests/units/scrollspy.spec.js
@@ -1,9 +1,9 @@
-import ScrollSpy from './scrollspy'
-import Manipulator from '../dom/manipulator'
-import EventHandler from '../dom/event-handler'
+import ScrollSpy from '../../src/scrollspy'
+import Manipulator from '../../src/dom/manipulator'
+import EventHandler from '../../src/dom/event-handler'
 
 /** Test helpers */
-import { getFixture, clearFixture, createEvent, jQueryMock } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture, createEvent, jQueryMock } from '../helpers/fixture'
 
 describe('ScrollSpy', () => {
   let fixtureEl

diff --git a/js/src/tab/tab.spec.js b/js/tests/units/tab.spec.js
similarity index 99%
rename from js/src/tab/tab.spec.js
rename to js/tests/units/tab.spec.js
index 0a678e38ee2d9647b39d1e6a17701b5d7f7a3f75..3e45f4d03e7d0198abf96a4ef2b2aa8233a330f7 100644 (file)
--- a/js/src/tab/tab.spec.js
+++ b/js/tests/units/tab.spec.js
@@ -1,7 +1,7 @@
-import Tab from './tab'
+import Tab from '../../src/tab'
 
 /** Test helpers */
-import { getFixture, clearFixture, jQueryMock } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Tab', () => {
   let fixtureEl

diff --git a/js/src/toast/toast.spec.js b/js/tests/units/toast.spec.js
similarity index 98%
rename from js/src/toast/toast.spec.js
rename to js/tests/units/toast.spec.js
index b00b860856b707a4aeb41371be5f33ddce47ecc2..ee623c8ccc5dc137bacf8ac34d627de80e890ef3 100644 (file)
--- a/js/src/toast/toast.spec.js
+++ b/js/tests/units/toast.spec.js
@@ -1,7 +1,7 @@
-import Toast from './toast'
+import Toast from '../../src/toast'
 
 /** Test helpers */
-import { getFixture, clearFixture, jQueryMock } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Toast', () => {
   let fixtureEl

diff --git a/js/src/tooltip/tooltip.spec.js b/js/tests/units/tooltip.spec.js
similarity index 99%
rename from js/src/tooltip/tooltip.spec.js
rename to js/tests/units/tooltip.spec.js
index a6cbd784754a8320021b701538a5ae9fd7e13cd4..338638a2d7ce2cd626775c9baba62689ffcf12b8 100644 (file)
--- a/js/src/tooltip/tooltip.spec.js
+++ b/js/tests/units/tooltip.spec.js
@@ -1,9 +1,9 @@
-import Tooltip from './tooltip'
-import EventHandler from '../dom/event-handler'
-import { makeArray, noop } from '../util/index'
+import Tooltip from '../../src/tooltip'
+import EventHandler from '../../src/dom/event-handler'
+import { makeArray, noop } from '../../src/util/index'
 
 /** Test helpers */
-import { getFixture, clearFixture, jQueryMock, createEvent } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture, jQueryMock, createEvent } from '../helpers/fixture'
 
 describe('Tooltip', () => {
   let fixtureEl

diff --git a/js/src/util/index.spec.js b/js/tests/units/util/index.spec.js
similarity index 98%
rename from js/src/util/index.spec.js
rename to js/tests/units/util/index.spec.js
index 9512c2fe0b09d12dc4606d676360f449dbc337dd..42c273f060bdbba9224476d86083a1d9b5ab271f 100644 (file)
--- a/js/src/util/index.spec.js
+++ b/js/tests/units/util/index.spec.js
@@ -1,7 +1,7 @@
-import * as Util from './index'
+import * as Util from '../../../src/util/index'
 
 /** Test helpers */
-import { getFixture, clearFixture } from '../../tests/helpers/fixture'
+import { getFixture, clearFixture } from '../../helpers/fixture'
 
 describe('Util', () => {
   let fixtureEl

diff --git a/js/src/util/sanitizer.spec.js b/js/tests/units/util/sanitizer.spec.js
similarity index 96%
rename from js/src/util/sanitizer.spec.js
rename to js/tests/units/util/sanitizer.spec.js
index 6dadd29a5af850dbe34f9a9c7d36ab1117c058c4..c4259e7fd66cb4ef4d4098b0591e0c3574eaaf25 100644 (file)
--- a/js/src/util/sanitizer.spec.js
+++ b/js/tests/units/util/sanitizer.spec.js
@@ -1,4 +1,4 @@
-import { DefaultWhitelist, sanitizeHtml } from './sanitizer'
+import { DefaultWhitelist, sanitizeHtml } from '../../../src/util/sanitizer'
 
 describe('Sanitizer', () => {
   describe('sanitizeHtml', () => {

diff --git a/package.json b/package.json
index 39f0ee5103f6dfe7b860db16d287ed0853412ce1..703a4dcb77008b9247bb7b01c4851b270008f560 100644 (file)
--- a/package.json
+++ b/package.json
@@ -141,7 +141,6 @@
   "files": [
     "dist/{css,js}/*.{css,js,map}",
     "js/{src,dist}/**/*.{js,map}",
-    "!js/src/**/*.spec.js",
     "scss/**/*.scss"
   ],
   "hugo-bin": {