Skip to content

Commit

Permalink
Upgrade jquery to version 3+
Browse files Browse the repository at this point in the history
- Upgrade jquery to version 3+, fixing old vulnerabilities
- Clean up some commented code
  • Loading branch information
mistergone committed Sep 7, 2018
1 parent d8d6d82 commit e742cd9
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"format-usd": "1.0.1",
"fs": "0.0.2",
"html5shiv": "3.7.3",
"jquery": "1.11.3",
"jquery": "^3.3.1",
"jquery.easing": "1.3.2",
"normalize-css": "2.3.1",
"normalize-legacy-addon": "0.1.0",
Expand Down
4 changes: 2 additions & 2 deletions test/functional/conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ exports.config = {
seleniumAddress: 'http://localhost:4444/wd/hub',
capabilities: { 'browserName': 'chrome' },
specs: ['dd-functional-settlement-spec.js', 'dd-settlement-only-spec.js', 'dd-feedback-spec.js', 'dd-school-data-spec.js', 'dd-interactions-spec.js' ],
// specs: ['dd-interactions-spec.js'],
// specs: ['dd-functional-settlement-spec.js'],
// By limiting the specs to one file, we can isolate and fix specific tests:
// specs: ['dd-settlement-only-spec.js'],
onPrepare:function(){
browser.ignoreSynchronization = true;
}
Expand Down
2 changes: 0 additions & 2 deletions test/functional/dd-functional-settlement-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ fdescribe( 'A dynamic financial aid disclosure that\'s required by settlement',
} );

it( 'should display the anticipated total direct cost section if passed in the URL', function() {
// browser.get( 'http://localhost:8000/paying-for-college2/understanding-your-financial-aid-offer/offer/?iped=408039&pid=981&oid=9e0280139f3238cbc9702c7b0d62e5c238a835a0&book=650&gib=3000&gpl=1000&hous=3000&insi=4.55&insl=3000&inst=36&mta=3000&othg=100&othr=500&parl=10000&pelg=1500&perl=3000&ppl=1000&prvl=3000&prvf=2.1&prvi=4.55&schg=2000&stag=2000&subl=3500&totl=40000&tran=500&tuit=38976&unsl=2000&wkst=3000' );
browser.wait(
browser.actions().mouseMove( page.totalDirectCost ).perform(), 10000
);
Expand Down Expand Up @@ -636,7 +635,6 @@ it( 'should properly update when more than one private loans is modified', funct
*/

it( 'should display the tuition payment plan section if passed in the URL', function() {
// browser.get( 'http://localhost:8000/paying-for-college2/understanding-your-financial-aid-offer/offer/?iped=408039&pid=981&oid=9e0280139f3238cbc9702c7b0d62e5c238a835a0&book=650&gib=3000&gpl=1000&hous=3000&insi=4.55&insl=3000&inst=36&mta=3000&othg=100&othr=500&parl=10000&pelg=1500&perl=3000&ppl=1000&prvl=3000&prvf=2.1&prvi=4.55&schg=2000&stag=2000&subl=3500&totl=40000&tran=500&tuit=38976&unsl=2000&wkst=3000' );
page.confirmVerification();
expect( page.paymentPlanAmount.isDisplayed() ).toBeTruthy();
expect( page.totalPaymentPlans.isDisplayed() ).toBeTruthy();
Expand Down
2 changes: 1 addition & 1 deletion test/functional/dd-settlement-only-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ fdescribe( 'The dynamic financial aid disclosure', function() {
expect( page.defaultRateLink.getAttribute( 'href' ) ).toEqual( 'http://nces.ed.gov/collegenavigator/?id=182111#fedloans' );
} );

it( 'should open the link to the College Navigator cohort loan default rates in a new tab with the loan default rates section open', function() {
fit( 'should open the link to the College Navigator cohort loan default rates in a new tab with the loan default rates section open', function() {
page.confirmVerification();
browser.sleep( 1000 );
page.continueStep2();
Expand Down

0 comments on commit e742cd9

Please sign in to comment.