Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
7c5d4942
Commit
7c5d4942
authored
Jan 28, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix frontend tests
parent
c454dec1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
10 deletions
+21
-10
spec/javascripts/commits_spec.js.es6
spec/javascripts/commits_spec.js.es6
+16
-4
spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
...ripts/filtered_search/filtered_search_manager_spec.js.es6
+5
-6
No files found.
spec/javascripts/commits_spec.js.es6
View file @
7c5d4942
/* global CommitsList */
/* global CommitsList */
//= require jquery.endless-scroll
require('vendor/jquery.endless-scroll');
//= require pager
require('~/pager');
//= require commits
require('~/commits');
(() => {
(() => {
// TODO: remove this hack!
// PhantomJS causes spyOn to panic because replaceState isn't "writable"
let phantomjs;
try {
phantomjs = !Object.getOwnPropertyDescriptor(window.history, 'replaceState').writable;
} catch (err) {
phantomjs = false;
}
describe('Commits List', () => {
describe('Commits List', () => {
beforeEach(() => {
beforeEach(() => {
setFixtures(`
setFixtures(`
...
@@ -25,7 +34,10 @@
...
@@ -25,7 +34,10 @@
beforeEach(() => {
beforeEach(() => {
CommitsList.init(25);
CommitsList.init(25);
CommitsList.searchField.val('');
CommitsList.searchField.val('');
spyOn(history, 'replaceState').and.stub();
if (!phantomjs) {
spyOn(history, 'replaceState').and.stub();
}
ajaxSpy = spyOn(jQuery, 'ajax').and.callFake((req) => {
ajaxSpy = spyOn(jQuery, 'ajax').and.callFake((req) => {
req.success({
req.success({
data: '<li>Result</li>',
data: '<li>Result</li>',
...
...
spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
View file @
7c5d4942
/* global Turbolinks */
/* global Turbolinks */
//= require turbolinks
require('~/lib/utils/common_utils');
//= require lib/utils/common_utils
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
require('~/filtered_search/filtered_search_dropdown_manager');
//= require filtered_search/filtered_search_dropdown_manager
require('~/filtered_search/filtered_search_manager');
//= require filtered_search/filtered_search_manager
(() => {
(() => {
describe('Filtered Search Manager', () => {
describe('Filtered Search Manager', () => {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment