Skip to content

Commit fafcd4b

Browse files
fuzhennfuzhenn
authored
add firefox ci tests, close #514 
1 parent a6ee566 commit fafcd4b

File tree

11 files changed

+81
-32
lines changed

11 files changed

+81
-32
lines changed

‎.travis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
branches:
2+
only:
3+
- "master"
4+
language: node_js
5+
node_js:
6+
- "6"
7+
addons:
8+
firefox: "latest"
9+
before_script:
10+
- "export DISPLAY=:99.0"
11+
- "sh -e /etc/init.d/xvfb start"
12+
- sleep 3 # give xvfb some time to start
13+
script:
14+
gulp test --browsers Firefox

‎API.md

Whitespace-only changes.

‎gulpfile.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,10 @@ const browsers = [];
3030

3131
const configBrowsers = options.browsers || process.env['MAPTALKS_BROWSERS'] || '';
3232
configBrowsers.split(',').forEach(name => {
33-
if (!name || name.length < 2) {
33+
if (!name || name.length < 1) {
3434
return;
3535
}
36-
const lname = name.toLowerCase();
37-
if (lname.indexOf('phantom') === 0) {
38-
browsers.push('PhantomJS');
39-
}
40-
if (lname[0] === 'i' && lname[1] === 'e') {
41-
browsers.push('IE' + lname.substr(2));
42-
} else {
43-
browsers.push(lname[0].toUpperCase() + lname.substr(1));
44-
}
36+
browsers.push(name);
4537
});
4638

4739
gulp.task('scripts', () => {

‎test/geometry/GeometryRemoveHideSpec.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
describe('Remove and Hide Geometry', function () {
1+
describe('Geometry.RemoveHide', function () {
22

33
var container;
44
var map;
@@ -31,9 +31,14 @@ describe('Remove and Hide Geometry', function () {
3131
REMOVE_CONTAINER(container);
3232
});
3333

34-
// 测试所有类型Geometry的公共方法
3534
var geometries = GEN_GEOMETRIES_OF_ALL_TYPES();
36-
35+
//override marker's default symbol by a 10 * 10 ellipse
36+
geometries[0].setSymbol({
37+
markerType : 'ellipse',
38+
markerWidth : 10,
39+
markerHeight : 10,
40+
markerFill : '#000'
41+
});
3742
for (var i = 0, len = geometries.length; i < len; i++) {
3843
testRemoveHide.call(this, geometries[i], context);
3944
}

‎test/geometry/MarkerSpec.js

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ describe('Geometry.Marker', function () {
319319
symbol : {
320320
textName : '■■■■■■■■■',
321321
textSize : { stops: [[7, 8], [14, 20]] },
322-
textFill : '#fff'
322+
textFill : '#000'
323323
}
324324
});
325325
var layer = new maptalks.VectorLayer('id', { 'drawImmediate' : true }).addTo(map);
@@ -331,6 +331,8 @@ describe('Geometry.Marker', function () {
331331
if (maptalks.Browser.ie) {
332332
// font is smaller with ie
333333
expect(layer).to.be.painted(20, 0);
334+
} else if (maptalks.Browser.gecko3d) {
335+
expect(layer).to.be.painted(20, -1);
334336
} else {
335337
expect(layer).to.be.painted(30, 0);
336338
}
@@ -359,6 +361,8 @@ describe('Geometry.Marker', function () {
359361
if (maptalks.Browser.ie) {
360362
// font is smaller with ie
361363
expect(layer).to.be.painted(10, 12);
364+
} else if (maptalks.Browser.gecko3d) {
365+
expect(layer).to.be.painted(10, 8);
362366
} else {
363367
expect(layer).to.be.painted(10, 12);
364368
}
@@ -424,7 +428,7 @@ describe('Geometry.Marker', function () {
424428
});
425429

426430
it('rotate vector path marker', function (done) {
427-
if (maptalks.Browser.ie) {
431+
if (maptalks.Browser.ie || maptalks.Browser.gecko) {
428432
// skip test with IE due to Security Error
429433
done();
430434
return;
@@ -463,7 +467,7 @@ describe('Geometry.Marker', function () {
463467
});
464468
var layer = new maptalks.VectorLayer('vector', marker);
465469
layer.once('layerload', function () {
466-
expect(layer).not.to.be.painted(11, 0);
470+
expect(layer).not.to.be.painted(12, 0);
467471
expect(layer).to.be.painted(-11, -11);
468472
done();
469473
})
@@ -485,7 +489,12 @@ describe('Geometry.Marker', function () {
485489
layer.once('layerload', function () {
486490
expect(layer).not.to.be.painted(11, 0);
487491
expect(layer).not.to.be.painted(-11, -11);
488-
expect(layer).to.be.painted(8, 86);
492+
if (maptalks.Browser.gecko3d) {
493+
expect(layer).to.be.painted(6, 70);
494+
} else {
495+
expect(layer).to.be.painted(8, 86);
496+
}
497+
489498
done();
490499
})
491500
.addTo(map);

‎test/geometry/SpriteSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ describe('Marker.Sprite', function () {
140140
});
141141

142142
it('vector path marker sprite', function (done) {
143-
if (maptalks.Browser.ie) {
143+
if (maptalks.Browser.ie || maptalks.Browser.gecko) {
144144
// IE throws SecurityError
145145
done();
146146
return;

‎test/geometry/TextBoxSpec.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
describe('#TextBox', function () {
1+
describe('Geometry.TextBox', function () {
22

33
var container;
44
var map;
@@ -9,6 +9,7 @@ describe('#TextBox', function () {
99
var setups = COMMON_CREATE_MAP(center);
1010
container = setups.container;
1111
map = setups.map;
12+
map.config('centerCross', true);
1213
map.removeBaseLayer();
1314
});
1415

@@ -158,7 +159,7 @@ describe('#TextBox', function () {
158159
map.addLayer(layer);
159160
layer.addGeometry(vector);
160161
expect(layer).to.be.painted(100 / 2 - padding[0] - 2, 0);
161-
expect(layer).not.to.be.painted(100 / 2 - padding[0], 0);
162+
expect(layer).not.to.be.painted(100 / 2 - padding[0] + 1, 0);
162163
expect(layer).not.to.be.painted(0, 0);
163164
});
164165

@@ -200,7 +201,7 @@ describe('#TextBox', function () {
200201
layer = new maptalks.VectorLayer('id', { 'drawImmediate' : true });
201202
map.addLayer(layer);
202203
layer.addGeometry(vector);
203-
expect(layer).to.be.painted(0, 100 / 2 - padding[1] - 7);
204+
expect(layer).to.be.painted(0, 100 / 2 - padding[1] - 9);
204205
expect(layer).not.be.painted();
205206
});
206207
});

‎test/layer/CanvasLayerSpec.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
describe('CanvasLayer', function () {
1+
describe('Layer.CanvasLayer', function () {
22

33
var container;
44
var map;
@@ -149,7 +149,11 @@ describe('CanvasLayer', function () {
149149
}
150150
}));
151151
layer.once('layerload', function () {
152-
expect(layer).to.be.painted(0, 0, [255, 0, 0]);
152+
if (maptalks.Browser.gecko3d) {
153+
expect(layer).to.be.painted(0, 0, [254, 0, 0]);
154+
} else {
155+
expect(layer).to.be.painted(0, 0, [255, 0, 0]);
156+
}
153157
expect(layer).not.to.be.painted(0, maskRadius + 2);
154158
done();
155159
});

‎test/layer/ParticleLayerSpec.js

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
describe('ParticleLayer', function () {
1+
describe('Layer.ParticleLayer', function () {
22

33
var container;
44
var map;
@@ -36,7 +36,11 @@ describe('ParticleLayer', function () {
3636
layer.getParticles = getParticles;
3737

3838
layer.once('layerload', function () {
39-
expect(layer).to.be.painted(0, 0, [255, 0, 0]);
39+
if (maptalks.Browser.gecko3d) {
40+
expect(layer).to.be.painted(0, 0, [254, 0, 0]);
41+
} else {
42+
expect(layer).to.be.painted(0, 0, [255, 0, 0]);
43+
}
4044
done();
4145
});
4246
layer.addTo(map);
@@ -107,7 +111,11 @@ describe('ParticleLayer', function () {
107111
}
108112
}));
109113
layer.once('layerload', function () {
110-
expect(layer).to.be.painted(0, 0, [255, 0, 0]);
114+
if (maptalks.Browser.gecko3d) {
115+
expect(layer).to.be.painted(0, 0, [254, 0, 0]);
116+
} else {
117+
expect(layer).to.be.painted(0, 0, [255, 0, 0]);
118+
}
111119
expect(layer).not.to.be.painted(0, maskRadius + 2);
112120
done();
113121
});
@@ -121,7 +129,11 @@ describe('ParticleLayer', function () {
121129
layer.once('add', function () {
122130
expect(layer).not.to.be.painted();
123131
layer.once('layerload', function () {
124-
expect(layer).to.be.painted(0, 0, [255, 0, 0]);
132+
if (maptalks.Browser.gecko3d) {
133+
expect(layer).to.be.painted(0, 0, [254, 0, 0]);
134+
} else {
135+
expect(layer).to.be.painted(0, 0, [255, 0, 0]);
136+
}
125137
done();
126138
});
127139
layer.show();
@@ -134,7 +146,7 @@ describe('ParticleLayer', function () {
134146
layer.getParticles = getParticles;
135147

136148
layer.once('layerload', function () {
137-
expect(layer).to.be.painted(0, 0, [255, 0, 0]);
149+
expect(layer).to.be.painted(0, 0);
138150
layer.once('hide', function () {
139151
expect(layer).not.to.be.painted();
140152
done();
@@ -160,7 +172,11 @@ describe('ParticleLayer', function () {
160172
expect(layer).not.to.be.painted(4, 0);
161173
}
162174
if (count === 2) {
163-
expect(layer).to.be.painted(4, 0, [255, 0, 0]);
175+
if (maptalks.Browser.gecko3d) {
176+
expect(layer).to.be.painted(4, 0, [254, 0, 0]);
177+
} else {
178+
expect(layer).to.be.painted(4, 0, [255, 0, 0]);
179+
}
164180
done();
165181
}
166182
});
@@ -185,7 +201,11 @@ describe('ParticleLayer', function () {
185201
expect(layer.isPlaying()).not.to.be.ok();
186202
setTimeout(function () {
187203
layer.once('layerload', function () {
188-
expect(layer).to.be.painted(3, 0, [255, 0, 0]);
204+
if (maptalks.Browser.gecko3d) {
205+
expect(layer).to.be.painted(3, 0, [254, 0, 0]);
206+
} else {
207+
expect(layer).to.be.painted(3, 0, [255, 0, 0]);
208+
}
189209
expect(layer.isPlaying()).to.be.ok();
190210
done();
191211
});

‎test/map/MapScrollZoomSpec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22

3-
describe('#MapScrollZoomSpec', function () {
3+
describe('Map.ScrollZoom', function () {
44
var container;
55
var map;
66
var center = new maptalks.Coordinate(118.846825, 32.046534);
77
var delay;
88
function scrollMap(delta) {
99
happen.once(container, {
10-
type: 'mousewheel',
10+
type: (maptalks.Browser.gecko ? 'DOMMouseScroll' : 'mousewheel'),
1111
detail: delta
1212
});
1313
}

0 commit comments

Comments
 (0)