Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix insert-adjacent error #11832

Merged
merged 1 commit into from Jun 23, 2016
Merged

Fix insert-adjacent error #11832

merged 1 commit into from Jun 23, 2016

Conversation

@GuillaumeGomez
Copy link
Contributor

GuillaumeGomez commented Jun 23, 2016 •
edited by larsbergstrom

r? @nox

This change is Reviewable
@highfive
Copy link

highfive commented Jun 23, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/element.rs
tests/wpt/web-platform-tests/domparsing/insert-adjacent.html Outdated
@@ -31,6 +31,7 @@
el.insertAdjacentHTML(position, html);
var heading = document.createElement('h3');
heading.innerHTML = position;
/* assert_equals(el.parentElement.innerHTML, "fuck"); */

This comment has been minimized.

Sign in to view
@nox

nox Jun 23, 2016

Member

What?
@nox
Copy link
Member

nox commented Jun 23, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2016

📌 Commit 349f579 has been approved by nox
@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2016

⌛ Testing commit 349f579 with merge 5ba49db...
bors-servo added a commit that referenced this pull request Jun 23, 2016
@bors-servo
Auto merge of #11832 - GuillaumeGomez:insert-adjacent, r=nox
5ba49db 
Fix insert-adjacent error

r? @nox

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11832)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2016

💔 Test failed - mac-rel-wpt
@jdm
Copy link
Member

jdm commented Jun 23, 2016 

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.html:
  └ PASS [expected FAIL] beforeBegin content without next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.html:
  └ PASS [expected FAIL] afterend content without next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.html:
  └ PASS [expected FAIL] beforeBegin content again, with next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.html:
  └ PASS [expected FAIL] afterend content again, with next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.html:
  └ PASS [expected FAIL] beforeBegin child node not in tree but has parent

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.html:
  └ PASS [expected FAIL] afterend child node not in tree but has parent

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.html:
  └ PASS [expected FAIL] beforeBegin content2 without next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.html:
  └ PASS [expected FAIL] afterend content2 without next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.html:
  └ PASS [expected FAIL] beforeBegin content2 test again, now that there's a next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.html:
  └ PASS [expected FAIL] afterend content2 test again, now that there's a next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.xhtml:
  └ PASS [expected FAIL] beforeBegin content without next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.xhtml:
  └ PASS [expected FAIL] afterend content without next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.xhtml:
  └ PASS [expected FAIL] beforeBegin content again, with next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.xhtml:
  └ PASS [expected FAIL] afterend content again, with next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.xhtml:
  └ PASS [expected FAIL] beforeBegin child node not in tree but has parent

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.xhtml:
  └ PASS [expected FAIL] afterend child node not in tree but has parent

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.xhtml:
  └ PASS [expected FAIL] beforeBegin content2 without next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.xhtml:
  └ PASS [expected FAIL] afterend content2 without next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.xhtml:
  └ PASS [expected FAIL] beforeBegin content2 test again, now that there's a next sibling

  ▶ Unexpected subtest result in /domparsing/insert_adjacent_html.xhtml:
  └ PASS [expected FAIL] afterend content2 test again, now that there's a next sibling
@GuillaumeGomez
Fix insert-adjacent error
Loading status checks…
fc88f81
@nox
Copy link
Member

nox commented Jun 23, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2016

📌 Commit fc88f81 has been approved by nox
@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2016

⌛ Testing commit fc88f81 with merge 5256517...
bors-servo added a commit that referenced this pull request Jun 23, 2016
@bors-servo
Auto merge of #11832 - GuillaumeGomez:insert-adjacent, r=nox
5256517 
Fix insert-adjacent error

r? @nox

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11832)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2016

💔 Test failed - linux-rel
@cbrewster
Copy link
Member

cbrewster commented Jun 23, 2016

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2016

⌛ Testing commit fc88f81 with merge 32f2ab7...
bors-servo added a commit that referenced this pull request Jun 23, 2016
@bors-servo
Auto merge of #11832 - GuillaumeGomez:insert-adjacent, r=nox
Loading status checks…
32f2ab7 
Fix insert-adjacent error

r? @nox

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11832)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows
@bors-servo bors-servo merged commit fc88f81 into servo:master Jun 23, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@GuillaumeGomez GuillaumeGomez deleted the GuillaumeGomez:insert-adjacent branch Jun 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nox nox

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@GuillaumeGomez @highfive @nox @bors-servo @jdm @cbrewster
You can’t perform that action at this time.