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

Comment out pending invalid scenario in xspec-rule.xspec #304

Merged
merged 121 commits into from
Jan 15, 2019

Conversation

AirQuick
Copy link
Member

This pull request derives from #303. So needs to be handled after that.


Two scenarios in xspec-rule.xspec are invalid in terms of schema (#60).

They are disabled by pending attributes. And in this case, the pending attributes are not being tested. (On the other hand, pending attributes in xspec-pending.xspec are actually tested.) So, we can comment out those two scenarios safely.

This pull request comments out the scenarios and inserts TODO comments describing what to do before activating them. Now xspec-rule.xspec is valid in terms of schema.

…185_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…c-rule

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…185_cumulative

# Conflicts:
#	test/xspec.bats
…c-rule

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…c-rule

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…c-rule

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…185_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…185_cumulative

# Conflicts:
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…185_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…c-rule

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…k/xspec into valid-xspec-rule

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…c-rule

# Conflicts:
#	build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…c-rule

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…c-rule

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick AirQuick added this to the v1.2.0 milestone Dec 24, 2018
@AirQuick AirQuick merged commit 041b2f7 into xspec:master Jan 15, 2019
@AirQuick AirQuick deleted the valid-xspec-rule branch January 15, 2019 15:43
@AirQuick
Copy link
Member Author

@cirulls
Merged this PR which just improves one of the test files.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant