jenkins-bot has submitted this change and it was merged.
Change subject: Fix ContentBranchNode test broken by ve.ce.ProtectedNode
......................................................................
Fix ContentBranchNode test broken by ve.ce.ProtectedNode
Also make sure Jenkins actually runs that test suite
Change-Id: I72b10db3875370da95cb20e127ac8f1efee425bf
---
M VisualEditor.hooks.php
M modules/ve/test/ce/ve.ce.ContentBranchNode.test.js
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index d29ca3b..3e36d12 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -123,6 +123,7 @@
'ce/ve.ce.NodeFactory.test.js',
'ce/ve.ce.Node.test.js',
'ce/ve.ce.BranchNode.test.js',
+ 'ce/ve.ce.ContentBranchNode.test.js',
'ce/ve.ce.LeafNode.test.js',
'ce/nodes/ve.ce.TextNode.test.js',
// VisualEditor initialization Tests
diff --git a/modules/ve/test/ce/ve.ce.ContentBranchNode.test.js
b/modules/ve/test/ce/ve.ce.ContentBranchNode.test.js
index c773dc9..820eef5 100644
--- a/modules/ve/test/ce/ve.ce.ContentBranchNode.test.js
+++ b/modules/ve/test/ce/ve.ce.ContentBranchNode.test.js
@@ -245,7 +245,8 @@
],
'html': 'a<b>b<span typeof="mw:Entity"
class="ve-ce-leafNode ' +
've-ce-MWEntityNode"
contenteditable="false">c</span>d<div ' +
- 'class="ve-ce-leafNode
ve-ce-generatedContentNode ve-ce-alienNode ve-ce-alienInlineNode" ' +
+ 'class="ve-ce-leafNode
ve-ce-generatedContentNode ve-ce-protectedNode ' +
+ 've-ce-alienNode ve-ce-alienInlineNode" ' +
'contenteditable="false"><tt>e</tt></div></b>'
}
];
--
To view, visit https://gerrit.wikimedia.org/r/62739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72b10db3875370da95cb20e127ac8f1efee425bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
