Commit 2ee2daa4 authored by Mike Greiling's avatar Mike Greiling

more post-merge fixes

parent fc4fcf33
...@@ -54,8 +54,8 @@ requireAll(require.context('./commit', false, /^\.\/.*\.(js|es6)$/)); ...@@ -54,8 +54,8 @@ requireAll(require.context('./commit', false, /^\.\/.*\.(js|es6)$/));
requireAll(require.context('./extensions', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./extensions', false, /^\.\/.*\.(js|es6)$/));
requireAll(require.context('./lib/utils', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./lib/utils', false, /^\.\/.*\.(js|es6)$/));
requireAll(require.context('./u2f', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./u2f', false, /^\.\/.*\.(js|es6)$/));
requireAll(require.context('.', false, /^\.\/(?!application).*\.(js|es6)$/));
requireAll(require.context('./droplab', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./droplab', false, /^\.\/.*\.(js|es6)$/));
requireAll(require.context('.', false, /^\.\/(?!application).*\.(js|es6)$/));
require('vendor/fuzzaldrin-plus'); require('vendor/fuzzaldrin-plus');
window.ES6Promise = require('vendor/es6-promise.auto'); window.ES6Promise = require('vendor/es6-promise.auto');
window.ES6Promise.polyfill(); window.ES6Promise.polyfill();
......
/* global Vue, VueResource, gl */ /* global Vue, VueResource, gl */
window.Vue = require('vue'); window.Vue = require('vue');
window.Vue.use(require('vue-resource')); window.Vue.use(require('vue-resource'));
require('../vue_common_component/commit') require('../vue_common_component/commit');
require('../boards/vue_resource_interceptor'); require('../boards/vue_resource_interceptor');
require('./status'); require('./status');
require('./store'); require('./store');
......
//= require extensions/array require('~/extensions/array');
//= require filtered_search/dropdown_utils require('~/filtered_search/dropdown_utils');
//= require filtered_search/filtered_search_tokenizer require('~/filtered_search/filtered_search_tokenizer');
//= require filtered_search/filtered_search_dropdown_manager require('~/filtered_search/filtered_search_dropdown_manager');
(() => { (() => {
describe('Dropdown Utils', () => { describe('Dropdown Utils', () => {
......
//= require extensions/array require('~/extensions/array');
//= require filtered_search/filtered_search_tokenizer require('~/filtered_search/filtered_search_tokenizer');
//= require filtered_search/filtered_search_dropdown_manager require('~/filtered_search/filtered_search_dropdown_manager');
(() => { (() => {
describe('Filtered Search Dropdown Manager', () => { describe('Filtered Search Dropdown Manager', () => {
......
//= require extensions/array require('~/extensions/array');
//= require filtered_search/filtered_search_token_keys require('~/filtered_search/filtered_search_token_keys');
(() => { (() => {
describe('Filtered Search Token Keys', () => { describe('Filtered Search Token Keys', () => {
......
//= require extensions/array require('~/extensions/array');
//= require filtered_search/filtered_search_token_keys require('~/filtered_search/filtered_search_token_keys');
//= require filtered_search/filtered_search_tokenizer require('~/filtered_search/filtered_search_tokenizer');
(() => { (() => {
describe('Filtered Search Tokenizer', () => { describe('Filtered Search Tokenizer', () => {
......
//= require lib/utils/text_utility require('~/lib/utils/text_utility');
(() => { (() => {
describe('text_utility', () => { describe('text_utility', () => {
......
//= require vue require('~/lib/utils/common_utils');
//= require lib/utils/common_utils require('~/vue_pagination/index');
//= require vue_pagination/index
/* global fixture, gl */
describe('Pagination component', () => { describe('Pagination component', () => {
let component; let component;
...@@ -17,7 +15,7 @@ describe('Pagination component', () => { ...@@ -17,7 +15,7 @@ describe('Pagination component', () => {
}; };
it('should render and start at page 1', () => { it('should render and start at page 1', () => {
fixture.set('<div class="test-pagination-container"></div>'); setFixtures('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({ component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'), el: document.querySelector('.test-pagination-container'),
...@@ -40,7 +38,7 @@ describe('Pagination component', () => { ...@@ -40,7 +38,7 @@ describe('Pagination component', () => {
}); });
it('should go to the previous page', () => { it('should go to the previous page', () => {
fixture.set('<div class="test-pagination-container"></div>'); setFixtures('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({ component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'), el: document.querySelector('.test-pagination-container'),
...@@ -61,7 +59,7 @@ describe('Pagination component', () => { ...@@ -61,7 +59,7 @@ describe('Pagination component', () => {
}); });
it('should go to the next page', () => { it('should go to the next page', () => {
fixture.set('<div class="test-pagination-container"></div>'); setFixtures('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({ component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'), el: document.querySelector('.test-pagination-container'),
...@@ -82,7 +80,7 @@ describe('Pagination component', () => { ...@@ -82,7 +80,7 @@ describe('Pagination component', () => {
}); });
it('should go to the last page', () => { it('should go to the last page', () => {
fixture.set('<div class="test-pagination-container"></div>'); setFixtures('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({ component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'), el: document.querySelector('.test-pagination-container'),
...@@ -103,7 +101,7 @@ describe('Pagination component', () => { ...@@ -103,7 +101,7 @@ describe('Pagination component', () => {
}); });
it('should go to the first page', () => { it('should go to the first page', () => {
fixture.set('<div class="test-pagination-container"></div>'); setFixtures('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({ component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'), el: document.querySelector('.test-pagination-container'),
...@@ -124,7 +122,7 @@ describe('Pagination component', () => { ...@@ -124,7 +122,7 @@ describe('Pagination component', () => {
}); });
it('should do nothing', () => { it('should do nothing', () => {
fixture.set('<div class="test-pagination-container"></div>'); setFixtures('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({ component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'), el: document.querySelector('.test-pagination-container'),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment