Skip to content

Commit

Permalink
rewrite scrollspy unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Johann-S committed Jul 23, 2019
1 parent 85b70ce commit b7b56cb
Show file tree
Hide file tree
Showing 6 changed files with 678 additions and 752 deletions.
2 changes: 1 addition & 1 deletion build/build-plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const bsPlugins = {
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.js'),
ScrollSpy: path.resolve(__dirname, '../js/src/scrollspy/scrollspy.js'),
Tab: path.resolve(__dirname, '../js/src/tab.js'),
Toast: path.resolve(__dirname, '../js/src/toast/toast.js'),
Tooltip: path.resolve(__dirname, '../js/src/tooltip/tooltip.js')
Expand Down
2 changes: 1 addition & 1 deletion js/index.esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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'
import ScrollSpy from './src/scrollspy/scrollspy'
import Tab from './src/tab'
import Toast from './src/toast/toast'
import Tooltip from './src/tooltip/tooltip'
Expand Down
2 changes: 1 addition & 1 deletion js/index.umd.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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'
import ScrollSpy from './src/scrollspy/scrollspy'
import Tab from './src/tab'
import Toast from './src/toast/toast'
import Tooltip from './src/tooltip/tooltip'
Expand Down
12 changes: 6 additions & 6 deletions js/src/scrollspy.js → js/src/scrollspy/scrollspy.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'

/**
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -341,7 +341,7 @@ EventHandler.on(window, Event.LOAD_DATA_API, () => {
* jQuery
* ------------------------------------------------------------------------
*/

/* istanbul ignore if */
if (typeof $ !== 'undefined') {
const JQUERY_NO_CONFLICT = $.fn[NAME]
$.fn[NAME] = ScrollSpy._jQueryInterface
Expand Down
Loading

0 comments on commit b7b56cb

Please sign in to comment.