Jens Ohlig has submitted this change and it was merged. Change subject: (bug 40235) added selenium tests for edit conflicts ......................................................................
(bug 40235) added selenium tests for edit conflicts - an old revId is injected with javascript to simulate an edit conflict Patch set 2: Rebased. Change-Id: Ib40493de6637a69682d1ff716502bde4b0e1eb94 --- M client/WikibaseClient.hooks.php M client/WikibaseClient.php M client/includes/EntityCacheUpdater.php M client/includes/LangLinkHandler.php D client/includes/SiteLinkCache.php A client/includes/store/ClientStore.php A client/includes/store/ClientStoreFactory.php A client/includes/store/EntityCache.php A client/includes/store/sql/ClientSqlStore.php R client/includes/store/sql/EntityCacheTable.php M client/tests/phpunit/includes/CachedEntityTest.php R client/tests/phpunit/includes/store/EntityCacheTableTest.php M lib/WikibaseLib.hooks.php M lib/WikibaseLib.php D lib/includes/SiteLinkTable.php R lib/includes/claim/Claim.php A lib/includes/claim/ClaimList.php R lib/includes/claim/ClaimObject.php A lib/includes/claim/Claims.php M lib/includes/entity/EntityObject.php M lib/includes/item/ItemObject.php M lib/includes/reference/ReferenceList.php M lib/includes/reference/References.php A lib/includes/store/SiteLinkCache.php A lib/includes/store/SiteLinkLookup.php A lib/includes/store/SiteLinkTable.php M lib/maintenance/pollForChanges.php A lib/tests/phpunit/claim/ClaimListTest.php M lib/tests/phpunit/reference/ReferenceListTest.php A lib/tests/phpunit/store/SiteLinkLookupTest.php R lib/tests/phpunit/store/SiteLinkTableTest.php M repo/Wikibase.hooks.php M repo/Wikibase.i18n.alias.php M repo/Wikibase.i18n.php M repo/Wikibase.php A repo/includes/EntityView.php M repo/includes/ItemDisambiguation.php M repo/includes/ItemView.php A repo/includes/PropertyView.php M repo/includes/content/EntityContent.php M repo/includes/content/EntityHandler.php M repo/includes/content/ItemContent.php M repo/includes/content/ItemHandler.php M repo/includes/content/PropertyContent.php A repo/includes/specials/SpecialCreateEntity.php M repo/includes/specials/SpecialCreateItem.php A repo/includes/specials/SpecialCreateProperty.php M repo/includes/specials/SpecialItemDisambiguation.php M repo/includes/store/Store.php M repo/includes/store/sql/SqlIdGenerator.php M repo/includes/store/sql/SqlStore.php M repo/includes/updates/ItemDeletionUpdate.php M repo/includes/updates/ItemStructuredSave.php M repo/maintenance/importInterlang.php M repo/resources/wikibase.special/wikibase.special.css M repo/resources/wikibase.ui.PropertyEditTool.EditableValue.AutocompleteInterface.js M repo/resources/wikibase.utilities/wikibase.utilities.jQuery.ui.js M repo/resources/wikibase.utilities/wikibase.utilities.jQuery.ui.wikibaseAutocomplete.js M repo/resources/wikibase.utilities/wikibase.utilities.js M repo/tests/phpunit/includes/ItemViewTest.php M repo/tests/phpunit/includes/api/ApiEditPageTest.php M repo/tests/phpunit/includes/content/EntityHandlerTest.php M repo/tests/phpunit/includes/store/IdGeneratorTest.php M repo/tests/phpunit/includes/store/StoreTest.php A repo/tests/phpunit/includes/store/sql/SqlIdGeneratorTest.php M repo/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tests.js A repo/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.wikibaseAutocomplete.tests.js M repo/tests/selenium/aliases/aliases_spec.rb A repo/tests/selenium/item/edit_conflict_spec.rb M repo/tests/selenium/item/editonoff_spec.rb M repo/tests/selenium/item/non_existing_item_spec.rb M repo/tests/selenium/language_selector/language_selector_spec.rb M repo/tests/selenium/qunit/qunit_spec.rb M repo/tests/selenium/special/create_item_spec.rb M repo/tests/selenium/special/item_by_title_spec.rb M repo/tests/selenium/special/item_disambiguation_spec.rb M repo/tests/selenium/special/recent_changes_spec.rb M selenium/Rakefile M selenium/configuration.yml.sample M selenium/lib/pages/create_item_page.rb M selenium/lib/pages/item_page.rb M selenium/lib/pages/noexisting_item_page.rb M selenium/lib/pages/undelete_item_page.rb 83 files changed, 3,332 insertions(+), 1,217 deletions(-) Approvals: Jens Ohlig: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/24007 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib40493de6637a69682d1ff716502bde4b0e1eb94 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: Anja Jentzsch <anja.jentz...@wikimedia.de> Gerrit-Reviewer: Ataherivand <abraham.taheriv...@wikimedia.de> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de> Gerrit-Reviewer: Jens Ohlig <jens.oh...@wikimedia.de> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
