Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 9a69677

Browse files
vojtajinaIgorMinar
authored andcommitted
Fix CSS tests on Opera
Opera translates name colors to numbers (red -> #ff0000) Other browsers like FF or Chrome translate number to rgb (#ff0000 -> rgb(255, 0, 0) So avoiding colors in tests is probably the easiest solution...
1 parent b6db58c commit 9a69677

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

test/BinderSpec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,10 @@ describe('Binder', function(){
425425
it('BindStyle', function(){
426426
var scope = this.compile('<div ng:style="style"/>');
427427

428-
scope.$eval('style={color:"red"}');
428+
scope.$eval('style={height: "10px"}');
429429
scope.$eval();
430430

431-
assertEquals("red", scope.$element.css('color'));
431+
assertEquals("10px", scope.$element.css('height'));
432432

433433
scope.$eval('style={}');
434434
scope.$eval();

test/directivesSpec.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ describe("directive", function(){
196196

197197
describe('ng:style', function(){
198198
it('should set', function(){
199-
var scope = compile('<div ng:style="{color:\'red\'}"></div>');
199+
var scope = compile('<div ng:style="{height: \'40px\'}"></div>');
200200
scope.$eval();
201-
expect(element.css('color')).toEqual('red');
201+
expect(element.css('height')).toEqual('40px');
202202
});
203203

204204
it('should silently ignore undefined style', function() {
@@ -208,15 +208,15 @@ describe("directive", function(){
208208
});
209209

210210
it('should preserve and remove previous style', function(){
211-
var scope = compile('<div style="color:red;" ng:style="myStyle"></div>');
211+
var scope = compile('<div style="height: 10px;" ng:style="myStyle"></div>');
212212
scope.$eval();
213-
expect(getStyle(element)).toEqual({color:'red'});
214-
scope.myStyle = {color:'blue', width:'10px'};
213+
expect(getStyle(element)).toEqual({height: '10px'});
214+
scope.myStyle = {height: '20px', width: '10px'};
215215
scope.$eval();
216-
expect(getStyle(element)).toEqual({color:'blue', width:'10px'});
216+
expect(getStyle(element)).toEqual({height: '20px', width: '10px'});
217217
scope.myStyle = {};
218218
scope.$eval();
219-
expect(getStyle(element)).toEqual({color:'red'});
219+
expect(getStyle(element)).toEqual({height: '10px'});
220220
});
221221
});
222222

test/scenario/dslSpec.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -273,15 +273,15 @@ describe("angular.scenario.dsl", function() {
273273
});
274274

275275
it('should get css', function() {
276-
doc.append('<div id="test" style="border: 1px solid red"></div>');
277-
$root.dsl.element('#test').css('border');
278-
expect($root.futureResult).toMatch(/red/);
276+
doc.append('<div id="test" style="height: 30px"></div>');
277+
$root.dsl.element('#test').css('height');
278+
expect($root.futureResult).toMatch(/30px/);
279279
});
280280

281281
it('should set css', function() {
282-
doc.append('<div id="test" style="border: 1px solid red"></div>');
283-
$root.dsl.element('#test').css('border', '1px solid green');
284-
expect(doc.find('#test').css('border')).toMatch(/green/);
282+
doc.append('<div id="test" style="height: 10px"></div>');
283+
$root.dsl.element('#test').css('height', '20px');
284+
expect(doc.find('#test').css('height')).toEqual('20px');
285285
});
286286

287287
it('should add all jQuery key/value methods', function() {

0 commit comments

Comments
 (0)