Skip to content

Commit a801a77

Browse files
authored
Debug JBrowseTest failure on SqlServer agents (#133)
* Debug JBrowseTest failure on SqlServer agents * Add jQuery and use isEmptyObject instead of Object.keys() * Add raw images to VCS
1 parent 95d12b8 commit a801a77

File tree

9 files changed

+7
-7
lines changed

9 files changed

+7
-7
lines changed

jbrowse/package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jbrowse/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"mobx-react": "^6.0.0",
2525
"mobx-state-tree": "3.14.1",
2626
"node-polyfill-webpack-plugin": "1.1.0",
27+
"jquery": "^3.6.0",
2728
"path-browserify": "^1.0.1",
2829
"pkg": "^5.3.2",
2930
"react-google-charts": "^3.0.15",

jbrowse/src/client/JBrowse/Browser/plugins/ExtendedVariantPlugin/ExtendedVariantRenderer/components/SvgFeatureRendering.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import SvgOverlay from '@jbrowse/plugin-svg/src/SvgFeatureRenderer/components/Sv
1212
import {chooseGlyphComponent, layOut} from './util' // NEW: chooseGlyphComponent() in util updated to render SNVs as a diamond
1313
import {deserializeFilters} from '../../InfoFilterWidget/filterUtil' // NOTE: Now dependent on FilterWidget plugin
1414
import jexl from 'jexl'
15+
import { isEmptyObject } from 'jquery';
1516

1617
const renderingStyle = {
1718
position: 'relative',
@@ -157,7 +158,7 @@ function passesSampleFilters(feature, sampleIDs){
157158
return true
158159
}
159160

160-
if (!feature.variant.SAMPLES || Object.keys(feature.variant.SAMPLES).length === 0) {
161+
if (!feature.variant.SAMPLES || isEmptyObject(feature.variant.SAMPLES)) {
161162
return false
162163
}
163164

jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,20 +319,17 @@ private void testInferredDetails()
319319

320320
private void testSampleFiltersFromUrl()
321321
{
322-
beginAt("/home/jbrowse-jbrowse.view?session=mgap&sampleFilters=mgap:m00010");
322+
// Note: this can be taxing on the browser, so load a more targeted region
323+
beginAt("/home/jbrowse-jbrowse.view?session=mgap&sampleFilters=mgap:m00010&location=1:116,980,271..116,983,486");
323324
checker().takeScreenShot("Jbrowse1_OnLoad");
324325

325326
waitForJBrowseToLoad();
326327
checker().takeScreenShot("Jbrowse2_OnLoad");
327328

328-
// NOTE: this should be replaced with something more specific
329-
sleep(5000);
330-
checker().takeScreenShot("Jbrowse3_OnLoad");
331-
332329
// Wait for variants to load:
333330
getDriver().findElements(getVariantWithinTrack("mgap_hg38", "SNV A -> G"));
334331

335-
Assert.assertEquals("Incorrect number of variants", 18, getTotalVariantFeatures());
332+
Assert.assertEquals("Incorrect number of variants", 3, getTotalVariantFeatures());
336333

337334
openTrackMenuItem("Filter By Sample");
338335
waitForElement(Locator.tagWithText("h6", "Filter By Sample"));

jbrowse/tools/demoImages/JB-1.psd

421 KB
Binary file not shown.

jbrowse/tools/demoImages/JB-2.psd

442 KB
Binary file not shown.

jbrowse/tools/demoImages/JB-3.psd

427 KB
Binary file not shown.

jbrowse/tools/demoImages/JB-4.psd

446 KB
Binary file not shown.

jbrowse/tools/demoImages/JB-5.psd

473 KB
Binary file not shown.

0 commit comments

Comments
 (0)