Skip to content
This repository was archived by the owner on Sep 18, 2020. It is now read-only.

Commit 6499005

Browse files
committed
Fix Jasmine tests
Adds modified version of Plotly package. Old one redefined polyfills and there were problems with Zone.js. Current build has modified es6 include as described here: plotly/plotly.js#955 Plotly component has to be further bind to data, but now it has just sample ones.
1 parent 70fb5c7 commit 6499005

File tree

4 files changed

+97
-95
lines changed

4 files changed

+97
-95
lines changed

src/Spectre.Angular2Client/karma.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module.exports = function (config) {
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
1818
files: [
19+
{ pattern: './src/app/plotly/plotly-latest.min.js', watched: false },
1920
{ pattern: './src/test.ts', watched: false }
2021
],
2122
preprocessors: {

src/Spectre.Angular2Client/package.json

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,43 @@
33
"version": "0.0.0",
44
"description": "Frontend for spectre.",
55
"author": "Michal Wolny <[email protected]>",
6-
"contributors": [{
6+
"contributors": [
7+
{
78
"name": "Dariusz Kuchta",
89
"email": "[email protected]"
9-
},{
10+
},
11+
{
1012
"name": "Grzegorz Mrukwa",
1113
"email": "[email protected]"
12-
},{
14+
},
15+
{
1316
"name": "Michal Gallus",
1417
"email": "[email protected]"
15-
},{
18+
},
19+
{
1620
"name": "Sebastian Pustelnik",
1721
"email": "[email protected]"
18-
},{
22+
},
23+
{
1924
"name": "Wojciech Wilgierz",
2025
"email": "[email protected]"
21-
}],
26+
}
27+
],
2228
"repository": {
23-
"type": "git",
24-
"url": "https://github.com/spectre-team/spectre"
29+
"type": "git",
30+
"url": "https://github.com/spectre-team/spectre"
2531
},
2632
"keywords": [
27-
"spectre",
28-
"maldi",
29-
"tof",
30-
"mass spectrometry",
31-
"analysis",
32-
"clustering",
33-
"divik",
34-
"divisive ik-means",
35-
"gmm",
36-
"gaussian mixture model"
33+
"spectre",
34+
"maldi",
35+
"tof",
36+
"mass spectrometry",
37+
"analysis",
38+
"clustering",
39+
"divik",
40+
"divisive ik-means",
41+
"gmm",
42+
"gaussian mixture model"
3743
],
3844
"license": "Apache-2.0",
3945
"scripts": {
@@ -69,9 +75,9 @@
6975
"karma": "~1.4.1",
7076
"karma-chrome-launcher": "~2.0.0",
7177
"karma-cli": "~1.0.1",
78+
"karma-coverage-istanbul-reporter": "^0.2.0",
7279
"karma-jasmine": "~1.1.0",
7380
"karma-jasmine-html-reporter": "^0.2.2",
74-
"karma-coverage-istanbul-reporter": "^0.2.0",
7581
"protractor": "~5.1.0",
7682
"ts-node": "~2.0.0",
7783
"tslint": "~4.5.0",

src/Spectre.Angular2Client/src/app/plotly/plotly-latest.min.js

Lines changed: 67 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Spectre.Angular2Client/src/app/plotly/plotly.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ export class PlotlyComponent implements OnInit {
1717
constructor() { }
1818

1919
ngOnInit() {
20-
Plotly.plot('plotlyDiv', [{
21-
x: [1, 2, 3, 4, 5],
22-
y: [1, 2, 4, 8, 16] }], {
23-
margin: { t: 0 } } );
20+
Plotly.plot('plotlyDiv', [{
21+
x: [1, 2, 3, 4, 5],
22+
y: [1, 2, 4, 8, 16] }], {
23+
margin: { t: 0 } } );
2424
}
2525

2626
}

0 commit comments

Comments
 (0)