Skip to content

Commit d713583

Browse files
code-ph0ymattlorimer
authored andcommitted
Upgrade jquery, jquery ui, bootstrap
add jquery migrate for compatibility Update acceptance test
1 parent ca5a461 commit d713583

File tree

7 files changed

+27
-23
lines changed

7 files changed

+27
-23
lines changed

include/javascript/jquery/bootstrap.min.js

+3-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

include/javascript/jquery/jquery-migrate.min.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

include/javascript/jquery/jquery-min.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

include/javascript/jquery/jquery-ui-min.js

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

include/javascript/jquery/jquery.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jssource/JSGroupings.php

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
$sugar_grp_jquery = array(
7171
//jquery
7272
'include/javascript/jquery/jquery-min.js' => 'include/javascript/sugar_grp1_jquery.js',
73+
'include/javascript/jquery/jquery-migrate.min.js' => 'include/javascript/sugar_grp1_jquery.js',
7374
//bootstrap
7475
'include/javascript/jquery/bootstrap.min.js' => 'include/javascript/sugar_grp1_jquery.js',
7576
'include/javascript/jquery/html5shiv.min.js' => 'include/javascript/sugar_grp1_jquery.js',

tests/acceptance/modules/Accounts/AccountsCest.php

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ public function testScenarioInlineEditListView(
136136
// Inline edit
137137
$I->visitPage('Accounts', 'index');
138138
$listView->waitForListViewVisible();
139+
$I->waitForElementVisible( '.inlineEditIcon');
139140
$I->doubleClick('.inlineEditIcon');
140141
$I->fillField('#name', 'InlineAccountNameEdit');
141142
$I->clickWithLeftButton('.suitepicon-action-confirm');
@@ -179,6 +180,7 @@ public function testScenarioCreateAccountChild(
179180

180181
// View child account in parent account subpanel
181182
$detailView->waitForDetailViewVisible();
183+
$I->waitForElementVisible( '//*[@id="list_subpanel_accounts"]/table/tbody/tr/td[2]/a');
182184
$I->see($accountName, '//*[@id="list_subpanel_accounts"]/table/tbody/tr/td[2]/a');
183185

184186
// Delete account

0 commit comments

Comments
 (0)