Commit8d20cb9

Krinkle

authored and

mgol

committed

Tests: Switch background image from online file to local 1x1.jpg

Also, remove unused `expected` property in `css` test cases.Closesgh-4866(cherry picked from commit482f846)

1 parentb3e4a7e commit8d20cb9Copy full SHA for 8d20cb9

File tree

2 files changed

-19

lines changed

test
- data
  - testsuite.css
- unit
  - css.js

2 files changed

-19

lines changed

`‎test/data/testsuite.css`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ div#fx-tests div.noback {`
`113`	`113`	`#nothiddendivchild.prct {font-size:150%; }`
`114`	`114`
`115`	`115`	`/* #9239 Attach a background to the body( avoid crashes in removing the test element in support ) */`
`116`		`-body,div {background:url(http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif) no-repeat-1000px0; }`
	`116`	`+body,div {background:url(1x1.jpg) no-repeat-1000px0; }`
`117`	`117`
`118`	`118`	`/* #10501 */`
`119`	`119`	`section {background:#f0f;display:block; }`

`‎test/unit/css.js`

Lines changed: 8 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -1536,40 +1536,32 @@ QUnit.test(`
`1536`	`1536`	`vardone=assert.async();`
`1537`	`1537`	`varstyles=[{`
`1538`	`1538`	`name:"backgroundAttachment",`
`1539`		`-value:["fixed"],`
`1540`		`-expected:["scroll"]`
	`1539`	`+value:["fixed"]`
`1541`	`1540`	`},{`
`1542`	`1541`	`name:"backgroundColor",`
`1543`		`-value:["rgb(255, 0, 0)","rgb(255,0,0)","#ff0000"],`
`1544`		`-expected:["transparent"]`
	`1542`	`+value:["rgb(255, 0, 0)","rgb(255,0,0)","#ff0000"]`
`1545`	`1543`	`},{`
`1546`	`1544`
`1547`	`1545`	`// Firefox returns auto's value`
`1548`	`1546`	`name:"backgroundImage",`
`1549`		`-value:["url('test.png')","url("+baseURL+"test.png)","url(\""+baseURL+"test.png\")"],`
`1550`		`-expected:["none","url(\"http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif\")"]`
	`1547`	`+value:["url('test.png')","url("+baseURL+"test.png)","url(\""+baseURL+"test.png\")"]`
`1551`	`1548`	`},{`
`1552`	`1549`	`name:"backgroundPosition",`
`1553`		`-value:["5% 5%"],`
`1554`		`-expected:["0% 0%","-1000px 0px","-1000px 0%"]`
	`1550`	`+value:["5% 5%"]`
`1555`	`1551`	`},{`
`1556`	`1552`
`1557`	`1553`	`// Firefox returns no-repeat`
`1558`	`1554`	`name:"backgroundRepeat",`
`1559`		`-value:["repeat-y"],`
`1560`		`-expected:["repeat","no-repeat"]`
	`1555`	`+value:["repeat-y"]`
`1561`	`1556`	`},{`
`1562`	`1557`	`name:"backgroundClip",`
`1563`		`-value:["padding-box"],`
`1564`		`-expected:["border-box"]`
	`1558`	`+value:["padding-box"]`
`1565`	`1559`	`},{`
`1566`	`1560`	`name:"backgroundOrigin",`
`1567`		`-value:["content-box"],`
`1568`		`-expected:["padding-box"]`
	`1561`	`+value:["content-box"]`
`1569`	`1562`	`},{`
`1570`	`1563`	`name:"backgroundSize",`
`1571`		`-value:["80px 60px"],`
`1572`		`-expected:["auto auto"]`
	`1564`	`+value:["80px 60px"]`
`1573`	`1565`	`}];`
`1574`	`1566`
`1575`	`1567`	`jQuery.each(styles,function(index,style){`
`@@ -1578,8 +1570,6 @@ QUnit.test(`
`1578`	`1570`	`source=$source[0],`
`1579`	`1571`	`$children=$source.children();`
`1580`	`1572`
`1581`		`-style.expected=style.expected.concat(["","auto"]);`
`1582`		`-`
`1583`	`1573`	`if(source.style[style.name]===undefined){`
`1584`	`1574`	`assert.ok(true,style.name+": style isn't supported and therefore not an issue");`
`1585`	`1575`	`assert.ok(true);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8d20cb9

File tree

2 files changed

2 files changed

`‎test/data/testsuite.css`

`‎test/unit/css.js`

0 commit comments