jenkins-bot has submitted this change and it was merged. Change subject: Browsertests: fix several broken tests in old-style browsertest ......................................................................
Browsertests: fix several broken tests in old-style browsertest Change-Id: Ib3c27df4d2e7bf7fcd381e89864097e9279859f0 --- M repo/tests/selenium/statements/qualifiers_spec.rb M repo/tests/selenium/statements/references_spec.rb M repo/tests/selenium/statements/statements_cm_spec.rb M repo/tests/selenium/statements/statements_coordinate_spec.rb M repo/tests/selenium/statements/statements_spec.rb M repo/tests/selenium/statements/statements_string_spec.rb M selenium/Gemfile.lock M selenium/lib/modules/statement_module.rb 8 files changed, 60 insertions(+), 31 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved WikidataJenkins: Verified jenkins-bot: Verified diff --git a/repo/tests/selenium/statements/qualifiers_spec.rb b/repo/tests/selenium/statements/qualifiers_spec.rb index c36aeac..f9e04d1 100644 --- a/repo/tests/selenium/statements/qualifiers_spec.rb +++ b/repo/tests/selenium/statements/qualifiers_spec.rb @@ -38,7 +38,9 @@ cm_statement_value = "Vespa_crabro_head_01.jpg" cm_qualifier_value = "Blason_CH_Canton_Valais_3D.svg" +cm_qualifier_value_expected = "Blason CH Canton Valais 3D.svg" cm_qualifier_value_changed = "BlueFeather.jpg" +cm_qualifier_value_changed_expected = "BlueFeather.jpg" describe "Check qualifiers UI" do before :all do @@ -179,6 +181,7 @@ page.entitySelectorInput2?.should be_false page.qualifierValueInput1?.should be_true page.qualifierValueInput1.should == cm_qualifier_value + ajax_wait page.saveStatement?.should be_true page.cancelStatement?.should be_true @@ -311,7 +314,7 @@ page.qualifierProperty2.should == properties_cm[1]["label"] page.qualifierPropertyLink2?.should be_true page.qualifierValue2?.should be_true - page.qualifierValue2.should == cm_qualifier_value + page.qualifierValue2.should == cm_qualifier_value_expected page.qualifierValueLink2?.should be_true @browser.refresh page.wait_for_entity_to_load @@ -325,7 +328,7 @@ page.qualifierProperty2.should == properties_cm[1]["label"] page.qualifierPropertyLink2?.should be_true page.qualifierValue2?.should be_true - page.qualifierValue2.should == cm_qualifier_value + page.qualifierValue2.should == cm_qualifier_value_expected page.qualifierValueLink2?.should be_true page.editFirstStatement?.should be_true @@ -352,7 +355,7 @@ page.qualifierProperty2.should == properties_cm[1]["label"] page.qualifierPropertyLink2?.should be_true page.qualifierValue2?.should be_true - page.qualifierValue2.should == cm_qualifier_value_changed + page.qualifierValue2.should == cm_qualifier_value_changed_expected page.qualifierValueLink2?.should be_true @browser.refresh page.wait_for_entity_to_load @@ -366,7 +369,7 @@ page.qualifierProperty2.should == properties_cm[1]["label"] page.qualifierPropertyLink2?.should be_true page.qualifierValue2?.should be_true - page.qualifierValue2.should == cm_qualifier_value_changed + page.qualifierValue2.should == cm_qualifier_value_changed_expected page.qualifierValueLink2?.should be_true end end diff --git a/repo/tests/selenium/statements/references_spec.rb b/repo/tests/selenium/statements/references_spec.rb index c1d19dc..6473933 100644 --- a/repo/tests/selenium/statements/references_spec.rb +++ b/repo/tests/selenium/statements/references_spec.rb @@ -38,9 +38,13 @@ cm_statement_value = "Louisiana 462.svg" cm_reference_value = "Lousiana Red Kammgarn.jpg" +cm_reference_value_expected = "Lousiana Red Kammgarn.jpg" cm_reference_value2 = "Nyan.jpg" +cm_reference_value2_expected = "Nyan.jpg" cm_reference_value_changed = "Denkmal.png" +cm_reference_value_changed_expected = "Denkmal.png" cm_reference_value_changed2 = "Dynamite-5.svg" +cm_reference_value_changed2_expected = "Dynamite-5.svg" describe "Check references UI" do before :all do @@ -117,6 +121,7 @@ page.removeReferenceLine1?.should be_false random_ref_value = generate_random_string(10) page.referenceValueInput = random_ref_value + ajax_wait page.saveReference?.should be_true page.cancelReference?.should be_true page.addReferenceLine?.should be_true @@ -147,6 +152,7 @@ page.wait_for_reference_value_box page.referenceValueInput_element.clear page.referenceValueInput = generate_random_string(10) + ajax_wait page.saveReference?.should be_true page.addReferenceLine?.should be_true page.cancelReference?.should be_true @@ -181,19 +187,20 @@ page.wait_for_entity_selector_list page.wait_for_reference_value_box page.referenceValueInput = cm_reference_value + ajax_wait page.saveReference?.should be_true page.saveReference ajax_wait page.wait_for_statement_request_finished page.reference1Property.should == properties_cm[1]["label"] - page.reference1Value.should == cm_reference_value + page.reference1Value.should == cm_reference_value_expected page.reference1ValueLink - page.articleTitle.include?("File:" + cm_reference_value).should be_true + page.articleTitle.include?("File:" + cm_reference_value_expected).should be_true page.navigate_to items[0]["url"] page.wait_for_entity_to_load page.toggle_reference_section page.reference1Property.should == properties_cm[1]["label"] - page.reference1Value.should == cm_reference_value + page.reference1Value.should == cm_reference_value_expected page.reference1PropertyLink page.wait_for_entity_to_load page.entityLabelSpan.should == properties_cm[1]["label"] @@ -201,7 +208,7 @@ page.wait_for_entity_to_load page.toggle_reference_section page.reference1ValueLink - page.articleTitle.include?("File:" + cm_reference_value).should be_true + page.articleTitle.include?("File:" + cm_reference_value_expected).should be_true end end @@ -220,6 +227,7 @@ page.referenceValueInput.should == cm_reference_value page.referenceValueInput_element.clear page.referenceValueInput = cm_reference_value_changed + ajax_wait page.saveReference?.should be_true page.removeReference?.should be_true page.cancelReference?.should be_true @@ -229,33 +237,35 @@ ajax_wait page.wait_for_statement_request_finished page.reference1Property.should == properties_cm[1]["label"] - page.reference1Value.should == cm_reference_value_changed + page.reference1Value.should == cm_reference_value_changed_expected # try to edit the reference twice in a row page.editReference1 page.referenceValueInput_element.clear page.referenceValueInput = cm_reference_value + ajax_wait page.saveReference ajax_wait page.wait_for_statement_request_finished page.reference1Property.should == properties_cm[1]["label"] - page.reference1Value.should == cm_reference_value + page.reference1Value.should == cm_reference_value_expected page.editReference1 page.referenceValueInput_element.clear page.referenceValueInput = cm_reference_value_changed + ajax_wait page.saveReference ajax_wait page.wait_for_statement_request_finished page.reference1Property.should == properties_cm[1]["label"] - page.reference1Value.should == cm_reference_value_changed + page.reference1Value.should == cm_reference_value_changed_expected page.reference1ValueLink - page.articleTitle.include?("File:" + cm_reference_value_changed).should be_true + page.articleTitle.include?("File:" + cm_reference_value_changed_expected).should be_true page.navigate_to items[0]["url"] page.wait_for_entity_to_load page.toggle_reference_section page.reference1Property.should == properties_cm[1]["label"] - page.reference1Value.should == cm_reference_value_changed + page.reference1Value.should == cm_reference_value_changed_expected end end @@ -293,6 +303,7 @@ page.wait_for_entity_selector_list page.wait_for_reference_value_box page.referenceValueInput = cm_reference_value + ajax_wait page.saveReference?.should be_true page.addReferenceLine?.should be_true page.addReferenceLine @@ -306,22 +317,23 @@ page.referenceValueInput?.should be_true page.referenceValueInput2?.should be_true page.referenceValueInput2 = cm_reference_value2 + ajax_wait page.saveReference?.should be_true page.saveReference ajax_wait page.wait_for_statement_request_finished page.reference1Property.should == properties_cm[0]["label"] - page.reference1Value.should == cm_reference_value + page.reference1Value.should == cm_reference_value_expected page.reference1Property2.should == properties_cm[1]["label"] - page.reference1Value2.should == cm_reference_value2 + page.reference1Value2.should == cm_reference_value2_expected page.reference1ValueLink - page.articleTitle.include?("File:" + cm_reference_value).should be_true + page.articleTitle.include?("File:" + cm_reference_value_expected).should be_true page.navigate_to items[0]["url"] page.wait_for_entity_to_load page.toggle_reference_section page.reference1ValueLink2 - page.articleTitle.include?("File:" + cm_reference_value2).should be_true + page.articleTitle.include?("File:" + cm_reference_value2_expected).should be_true page.navigate_to items[0]["url"] page.wait_for_entity_to_load page.toggle_reference_section @@ -339,9 +351,9 @@ page.wait_for_entity_to_load page.toggle_reference_section page.reference1Property.should == properties_cm[0]["label"] - page.reference1Value.should == cm_reference_value + page.reference1Value.should == cm_reference_value_expected page.reference1Property2.should == properties_cm[1]["label"] - page.reference1Value2.should == cm_reference_value2 + page.reference1Value2.should == cm_reference_value2_expected end end @@ -377,27 +389,29 @@ page.referenceValueInput_element.clear page.referenceValueInput2_element.clear page.referenceValueInput = cm_reference_value_changed + ajax_wait page.referenceValueInput2 = cm_reference_value_changed2 + ajax_wait page.saveReference?.should be_true page.saveReference ajax_wait page.wait_for_statement_request_finished page.reference1ValueLink - page.articleTitle.include?("File:" + cm_reference_value_changed).should be_true + page.articleTitle.include?("File:" + cm_reference_value_changed_expected).should be_true page.navigate_to items[0]["url"] page.wait_for_entity_to_load page.toggle_reference_section page.reference1ValueLink2 - page.articleTitle.include?("File:" + cm_reference_value_changed2).should be_true + page.articleTitle.include?("File:" + cm_reference_value_changed2_expected).should be_true page.navigate_to items[0]["url"] page.wait_for_entity_to_load page.toggle_reference_section page.reference1Property.should == properties_cm[0]["label"] - page.reference1Value.should == cm_reference_value_changed + page.reference1Value.should == cm_reference_value_changed_expected page.reference1Property2.should == properties_cm[1]["label"] - page.reference1Value2.should == cm_reference_value_changed2 + page.reference1Value2.should == cm_reference_value_changed2_expected end end diff --git a/repo/tests/selenium/statements/statements_cm_spec.rb b/repo/tests/selenium/statements/statements_cm_spec.rb index 7cd829e..99eaf43 100644 --- a/repo/tests/selenium/statements/statements_cm_spec.rb +++ b/repo/tests/selenium/statements/statements_cm_spec.rb @@ -14,6 +14,7 @@ prop_description = generate_random_string(20) prop_datatype = "Commons media file" cm_filename = "Air_France_A380_F-HPJA.jpg" +cm_filename_expected = "Air France A380 F-HPJA.jpg" describe "Check commons media statements UI" do before :all do @@ -33,13 +34,13 @@ page.wait_for_entity_to_load page.add_statement(prop_label, cm_filename) page.statement1Name.should == prop_label - page.statement1ClaimValue1.include?(cm_filename).should be_true + page.statement1ClaimValue1.include?(cm_filename_expected).should be_true page.statement1ClaimValue1_element.click page.current_url.include?("commons.wikimedia.org/wiki/File:" + cm_filename).should be_true page.navigate_to_item page.wait_for_entity_to_load page.statement1Name.should == prop_label - page.statement1ClaimValue1.include?(cm_filename).should be_true + page.statement1ClaimValue1.include?(cm_filename_expected).should be_true page.statement1ClaimValue1_element.click page.current_url.include?("commons.wikimedia.org/wiki/File:" + cm_filename).should be_true end diff --git a/repo/tests/selenium/statements/statements_coordinate_spec.rb b/repo/tests/selenium/statements/statements_coordinate_spec.rb index 73b44a1..6169bf9 100644 --- a/repo/tests/selenium/statements/statements_coordinate_spec.rb +++ b/repo/tests/selenium/statements/statements_coordinate_spec.rb @@ -12,7 +12,7 @@ item_description = generate_random_string(20) prop_label = generate_random_string(10) prop_description = generate_random_string(20) -prop_datatype = "Geographic coordinate" +prop_datatype = "Geographic coordinates" not_recognized = "no valid value recognized" # utf8 code for ° sign: \u00B0 coordinate_values = Array.new diff --git a/repo/tests/selenium/statements/statements_spec.rb b/repo/tests/selenium/statements/statements_spec.rb index 445e274..487c383 100644 --- a/repo/tests/selenium/statements/statements_spec.rb +++ b/repo/tests/selenium/statements/statements_spec.rb @@ -36,8 +36,8 @@ count = count + 1 end -statement_value = generate_random_string(10) + '.jpg' -statement_value_changed = generate_random_string(10) + '.jpg' +statement_value = 'C' + generate_random_string(10) + '.jpg' +statement_value_changed = 'C' + generate_random_string(10) + '.jpg' describe "Check statements UI" do before :all do @@ -134,6 +134,7 @@ page.statementValueInput?.should be_true page.saveStatement?.should be_false page.statementValueInput = statement_value + ajax_wait page.saveStatement?.should be_true page.cancelStatement page.addStatement?.should be_true @@ -156,6 +157,7 @@ page.wait_for_entity_selector_list page.wait_for_property_value_box page.statementValueInput = statement_value + ajax_wait page.saveStatement ajax_wait page.wbErrorDiv?.should be_true @@ -249,6 +251,7 @@ ajax_wait page.statementValueInput?.should be_true page.statementValueInput = statement_value + ajax_wait page.statementValueInput_element.send_keys :return ajax_wait page.wait_for_statement_request_finished @@ -262,7 +265,7 @@ on_page(ItemPage) do |page| page.navigate_to items[0]["url"] page.wait_for_entity_to_load - values = [generate_random_string(10) + '.jpg', generate_random_string(10) + '.jpg', generate_random_string(10) + '.jpg'] + values = ['C' + generate_random_string(10) + '.jpg', 'C' + generate_random_string(10) + '.jpg', 'C' + generate_random_string(10) + '.jpg'] page.add_statement(properties_cm[0]["label"], values[0]) page.statement1Name.should == properties_cm[0]["label"] page.statement1ClaimValue1.should == values[0] @@ -314,9 +317,10 @@ on_page(ItemPage) do |page| page.navigate_to items[0]["url"] page.wait_for_entity_to_load - statement1_values = [generate_random_string(10) + '.jpg', generate_random_string(10) + '.jpg'] - statement2_values = [generate_random_string(10) + '.jpg', generate_random_string(10) + '.jpg'] + statement1_values = ['C' + generate_random_string(10) + '.jpg', 'C' + generate_random_string(10) + '.jpg'] + statement2_values = ['C' + generate_random_string(10) + '.jpg', 'C' + generate_random_string(10) + '.jpg'] page.add_statement(properties_cm[0]["label"], statement1_values[0]) + ajax_wait page.statement1Name.should == properties_cm[0]["label"] page.statement1ClaimValue1.should == statement1_values[0] page.add_statement(properties_cm[1]["label"], statement2_values[0]) @@ -352,8 +356,10 @@ page.statementValueInput_element.clear page.saveStatement?.should be_false page.statementValueInput = statement_value_changed + ajax_wait page.saveStatement?.should be_true page.cancelStatement + ajax_wait page.statement1Name?.should be_true page.statement1ClaimValue1?.should be_true page.addStatement?.should be_true @@ -371,6 +377,7 @@ page.editFirstStatement page.statementValueInput_element.clear page.statementValueInput = statement_value_changed + ajax_wait page.saveStatement ajax_wait page.wait_for_statement_request_finished diff --git a/repo/tests/selenium/statements/statements_string_spec.rb b/repo/tests/selenium/statements/statements_string_spec.rb index 0646094..3cce138 100644 --- a/repo/tests/selenium/statements/statements_string_spec.rb +++ b/repo/tests/selenium/statements/statements_string_spec.rb @@ -81,6 +81,7 @@ page.wait_for_entity_selector_list page.wait_for_property_value_box page.statementValueInput = string_value_toolong + ajax_wait page.saveStatement ajax_wait page.wbErrorDiv?.should be_true diff --git a/selenium/Gemfile.lock b/selenium/Gemfile.lock index 465758f..a4e471a 100644 --- a/selenium/Gemfile.lock +++ b/selenium/Gemfile.lock @@ -10,6 +10,7 @@ faker (1.2.0) i18n (~> 0.5) ffi (1.9.3) + ffi (1.9.3-x86-mingw32) i18n (0.6.9) multi_json (1.8.2) page-object (0.9.4) @@ -42,6 +43,7 @@ PLATFORMS ruby + x86-mingw32 DEPENDENCIES page-object diff --git a/selenium/lib/modules/statement_module.rb b/selenium/lib/modules/statement_module.rb index ad70b6a..f8e040f 100644 --- a/selenium/lib/modules/statement_module.rb +++ b/selenium/lib/modules/statement_module.rb @@ -84,6 +84,7 @@ addClaimToFirstStatement self.wait_for_property_value_box self.statementValueInput = statement_value + ajax_wait saveStatement ajax_wait self.wait_for_statement_request_finished -- To view, visit https://gerrit.wikimedia.org/r/115190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib3c27df4d2e7bf7fcd381e89864097e9279859f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits