Skip to content

Commit 81ed183

Browse files
committed
Remove ui/jquery
1 parent 961f791 commit 81ed183

File tree

5 files changed

+12
-179
lines changed

5 files changed

+12
-179
lines changed

src/legacy/ui/public/fancy_forms/__tests__/nested_fancy_forms.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import ngMock from 'ng_mock';
2121
import expect from '@kbn/expect';
22+
import testSubjSelector from '@kbn/test-subj-selector';
2223
import sinon from 'sinon';
2324
import $ from 'jquery';
2425

@@ -85,7 +86,7 @@ describe('fancy forms', function () {
8586

8687
expect($scope.person.errorCount()).to.be(1);
8788
expect($scope.person.softErrorCount()).to.be(0);
88-
$el.findTestSubject('submit').click();
89+
$el.find(testSubjSelector('submit')).click();
8990
expect($scope.person.errorCount()).to.be(1);
9091
expect($scope.person.softErrorCount()).to.be(1);
9192
});
@@ -96,7 +97,7 @@ describe('fancy forms', function () {
9697

9798
expect($scope.person.errorCount()).to.be(1);
9899
sinon.assert.notCalled(onSubmit);
99-
$el.findTestSubject('submit').click();
100+
$el.find(testSubjSelector('submit')).click();
100101
expect($scope.person.errorCount()).to.be(1);
101102
sinon.assert.notCalled(onSubmit);
102103

@@ -106,15 +107,15 @@ describe('fancy forms', function () {
106107

107108
expect($scope.person.errorCount()).to.be(0);
108109
sinon.assert.notCalled(onSubmit);
109-
$el.findTestSubject('submit').click();
110+
$el.find(testSubjSelector('submit')).click();
110111
expect($scope.person.errorCount()).to.be(0);
111112
sinon.assert.calledOnce(onSubmit);
112113
});
113114

114115
it('new fields are no longer soft after blur', function () {
115116
const { $scope, $el } = setup({ name: '' });
116117
expect($scope.person.softErrorCount()).to.be(0);
117-
$el.findTestSubject('name').blur();
118+
$el.find(testSubjSelector('name')).blur();
118119
expect($scope.person.softErrorCount()).to.be(1);
119120
});
120121

@@ -139,7 +140,7 @@ describe('fancy forms', function () {
139140
expect($scope.person.errorCount()).to.be(2);
140141
expect($scope.person.softErrorCount()).to.be(0);
141142

142-
$el.findTestSubject('taskDesc').first().blur();
143+
$el.find(testSubjSelector('taskDesc')).first().blur();
143144

144145
expect($scope.person.errorCount()).to.be(2);
145146
expect($scope.person.softErrorCount()).to.be(1);
@@ -177,7 +178,7 @@ describe('fancy forms', function () {
177178
expect(form.softErrorCount()).to.be(0);
178179

179180
// blurs only count locally
180-
$task.findTestSubject('taskDesc').blur();
181+
$task.find(testSubjSelector('taskDesc')).blur();
181182
expect(form.softErrorCount()).to.be(1);
182183

183184
// but parent form see them

src/legacy/ui/public/jquery/__tests__/find_test_subject.js

Lines changed: 0 additions & 88 deletions
This file was deleted.

src/legacy/ui/public/jquery/find_test_subject.js

Lines changed: 0 additions & 77 deletions
This file was deleted.

src/legacy/ui/public/modals/__tests__/confirm_modal_promise.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919

2020
import expect from '@kbn/expect';
21+
import testSubjSelector from '@kbn/test-subj-selector';
2122
import ngMock from 'ng_mock';
2223
import sinon from 'sinon';
2324
import $ from 'jquery';
@@ -43,7 +44,7 @@ describe('ui/modals/confirm_modal_promise', function () {
4344

4445
afterEach(function () {
4546
$rootScope.$digest();
46-
$.findTestSubject('confirmModalConfirmButton').click();
47+
$(testSubjSelector('confirmModalConfirmButton')).click();
4748
});
4849

4950
describe('before timeout completes', function () {
@@ -58,7 +59,7 @@ describe('ui/modals/confirm_modal_promise', function () {
5859
describe('after timeout completes', function () {
5960
it('confirmation dialogue is loaded to dom with message', function () {
6061
$rootScope.$digest();
61-
const confirmModalElement = $.findTestSubject('confirmModal');
62+
const confirmModalElement = $(testSubjSelector('confirmModal'));
6263
expect(confirmModalElement).to.not.be(undefined);
6364

6465
const htmlString = confirmModalElement[0].innerHTML;
@@ -73,7 +74,7 @@ describe('ui/modals/confirm_modal_promise', function () {
7374

7475
promise.then(confirmCallback, cancelCallback);
7576
$rootScope.$digest();
76-
const confirmButton = $.findTestSubject('confirmModalConfirmButton');
77+
const confirmButton = $(testSubjSelector('confirmModalConfirmButton'));
7778

7879
confirmButton.click();
7980
expect(confirmCallback.called).to.be(true);
@@ -88,7 +89,7 @@ describe('ui/modals/confirm_modal_promise', function () {
8889
promise.then(confirmCallback, cancelCallback);
8990

9091
$rootScope.$digest();
91-
const noButton = $.findTestSubject('confirmModalCancelButton');
92+
const noButton = $(testSubjSelector('confirmModalCancelButton'));
9293
noButton.click();
9394

9495
expect(cancelCallback.called).to.be(true);

src/legacy/ui/public/test_harness/test_harness.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
*/
1919

2020
// chrome expects to be loaded first, let it get its way
21-
import $ from 'jquery';
22-
import bindJqueryToFindTestSubject from 'ui/jquery/find_test_subject';
2321
import chrome from '../chrome';
2422

2523
import { parse as parseUrl } from 'url';
@@ -32,8 +30,6 @@ import './test_harness.css';
3230
import 'ng_mock';
3331
import { setupTestSharding } from './test_sharding';
3432

35-
bindJqueryToFindTestSubject($);
36-
3733
const { query } = parseUrl(window.location.href, true);
3834
if (query && query.mocha) {
3935
try {

0 commit comments

Comments
 (0)