diff options
author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-19 05:22:53 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-19 05:22:53 +0300 |
commit | 8f4bc9695380d465e7dfe365e66a0153f76040ff (patch) | |
tree | 3d6bbfa74611f54feb70c3fc5c1df81e8ca6bf94 /tests | |
parent | af368cfc02bae5026429b0418d83de2b0890ef44 (diff) | |
parent | 8dbc563e99432f38de107be3dfb0f0a17b9e8f87 (diff) |
Merge pull request #11038 from piwik/3.x-dev3.0.0
Piwik 3.0.0 release
Diffstat (limited to 'tests')
8 files changed, 17 insertions, 19 deletions
diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png index 8177bcaaa6..8e60bc335f 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png +++ b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33c350c7584ee6937224850ac176927157ea8ecee633380cc44ff322b1721b3f -size 262822 +oid sha256:6ed9788df6f0f938486e24797ca3422f310085e336391b81e40787ecd8c5553d +size 289862 diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png index aa53f901af..e99caa0e59 100644 --- a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png +++ b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f7b947c06030d891d78ed0d0c7e1cdd7649e1da0d4e75475f7e3437137148c8 -size 48582 +oid sha256:3a1cd08f745e680fa7e167a198ed5fef4e069791821936c6f340051b222a84c0 +size 48560 diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png index 88c32f48cc..c7526f6363 100644 --- a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png +++ b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88a844d0f57feb6f788b6322763df6542049d4aab8a5e0739b488d867fa0adf7 -size 47395 +oid sha256:af83134ac7d91edfa60300eaad7b709304faafe868656bcf17ae4cd6dd7787a1 +size 47393 diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_4_segment_editor_expanded_dimensions.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_4_segment_editor_expanded_dimensions.png index f8ef1a9571..525a904f9e 100644 --- a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_4_segment_editor_expanded_dimensions.png +++ b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_4_segment_editor_expanded_dimensions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e99d0bcbb9705964c1ab233bd4d8ca792f669549f5e274a13c78a42d243b559a -size 52497 +oid sha256:4f4f99126835ee863ea6eb295eceb633abe8fbbee8c6ea3414484811b832da84 +size 52667 diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_5_segment_editor_search_dimensions.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_5_segment_editor_search_dimensions.png index 5f6634174c..bb9daa3135 100644 --- a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_5_segment_editor_search_dimensions.png +++ b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_5_segment_editor_search_dimensions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:525c797e7c8c49414f50264514b981d544d53350f1064c794b2c0acc28a34ec8 -size 43877 +oid sha256:e8098f472b93da640ebfac6ce43641f8eea3d230ca42ddba359a93089fdfdcd8 +size 43896 diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png index 39ec92b65a..466bf58cd5 100644 --- a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png +++ b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cd31cd64a4bb03d1d6a08c599b73bc3ae68016b337b4af0a6285ad69b859a8e -size 38448 +oid sha256:a863803d25a5a883293faeaed5b13bd27e838a13bd0539f182c266ad7cc16c61 +size 38469 diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png index 3379754b35..617aa2636d 100644 --- a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png +++ b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9469fe003119adadf54ff5111490d85d4bdad47bcbcd463a00ab01d8f7372f1 -size 47842 +oid sha256:8c02271897f5e217b9ad31390734db144f2c9c044aeff007523e4324682faa6e +size 47865 diff --git a/tests/UI/specs/SegmentSelectorEditor_spec.js b/tests/UI/specs/SegmentSelectorEditor_spec.js index 5b22be9ad1..d144a9be54 100644 --- a/tests/UI/specs/SegmentSelectorEditor_spec.js +++ b/tests/UI/specs/SegmentSelectorEditor_spec.js @@ -28,12 +28,10 @@ describe("SegmentSelectorEditorTest", function () { }); it("should open segment editor when edit link clicked for existing segment", function (done) { - - this.retries(3); - expect.screenshot("2_segment_editor_update").to.be.captureSelector(selectorsToCapture, function (page) { - page.click('.segmentList .editSegment:first'); - page.wait(1000); + page.evaluate(function() { + $('.segmentList .editSegment:first').click() + }, 200); }, done); }); |