Skip to content
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 <noscript> tests #158

Merged
merged 1 commit into from Sep 1, 2015
Merged

Fix <noscript> tests #158

merged 1 commit into from Sep 1, 2015

Conversation

@nox
Copy link
Member

nox commented Aug 19, 2015

Use the expectations' fields script-on and script-off to run the tests with their scripting flag set appropriately.

Review on Reviewable

@nox nox force-pushed the nox:noscript branch from b186d66 to bbd33f1 Aug 19, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

The latest upstream changes (presumably #153) made this pull request unmergeable. Please resolve the merge conflicts.

@nox nox force-pushed the nox:noscript branch from bbd33f1 to 0b189dd Sep 1, 2015
Use the expectations' fields script-on and script-off to run the tests with
their scripting flag set appropriately.
let ignore = ignores.contains(&name);
let data = get_field("data");
let ignore = ignores.contains(name)
|| IGNORE_SUBSTRS.iter().any(|&ig| data.contains(ig));

This comment has been minimized.

@SimonSapin

SimonSapin Sep 1, 2015

Member

IGNORE_SUBSTRS was removed in another PR.

@nox nox force-pushed the nox:noscript branch from 0b189dd to cde1c51 Sep 1, 2015
@nox
Copy link
Member Author

nox commented Sep 1, 2015

Fixed. :)

@SimonSapin
Copy link
Member

SimonSapin commented Sep 1, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

📌 Commit cde1c51 has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

Testing commit cde1c51 with merge 215903d...

bors-servo pushed a commit that referenced this pull request Sep 1, 2015
Fix <noscript> tests

Use the expectations' fields script-on and script-off to run the tests with their scripting flag set appropriately.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/html5ever/158)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

☀️ Test successful - travis

@bors-servo bors-servo merged commit cde1c51 into servo:master Sep 1, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@nox nox deleted the nox:noscript branch Sep 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.