diff options
| author | sgiehl <stefan@piwik.org> | 2016-09-01 12:03:47 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2016-09-01 12:37:37 +0300 |
| commit | fa2ea69a59f579a860ad1dd2d4c54e1ae8cc3391 (patch) | |
| tree | 6030f0ec76c29df0b1bdc24dbb92703e66c74690 /plugins/ExamplePlugin | |
| parent | 2d57ea30192fadf305a962277f19ca8b2cf32ea0 (diff) | |
| parent | 739a236b360181a3a5e5c7db379abeef7e72f75d (diff) | |
Merge branch 'master' into 3.0-m07
Diffstat (limited to 'plugins/ExamplePlugin')
| -rw-r--r-- | plugins/ExamplePlugin/tests/UI/expected-screenshots/.gitkeep (renamed from plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/.gitkeep) | 0 | ||||
| -rw-r--r-- | plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePage.png | 3 | ||||
| -rw-r--r-- | plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png | 3 | ||||
| -rw-r--r-- | plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePage.png | bin | 20115 -> 0 bytes | |||
| -rw-r--r-- | plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePagePartial.png | bin | 15636 -> 0 bytes |
5 files changed, 6 insertions, 0 deletions
diff --git a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/.gitkeep b/plugins/ExamplePlugin/tests/UI/expected-screenshots/.gitkeep index e69de29bb2..e69de29bb2 100644 --- a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/.gitkeep +++ b/plugins/ExamplePlugin/tests/UI/expected-screenshots/.gitkeep diff --git a/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePage.png b/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePage.png new file mode 100644 index 0000000000..7d008f2447 --- /dev/null +++ b/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePage.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd2ae82aa744764e479a8046edff8a9785103159f7b84f834424c4a4eae6cddb +size 15064 diff --git a/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png b/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png new file mode 100644 index 0000000000..546af84765 --- /dev/null +++ b/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4ab58a1573a4d3f1c2a4513ec10e21496b00f937d9eb851f181aaffd60aeb2e +size 10111 diff --git a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePage.png b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePage.png Binary files differdeleted file mode 100644 index 32cf4f5fd6..0000000000 --- a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePage.png +++ /dev/null diff --git a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePagePartial.png b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePagePartial.png Binary files differdeleted file mode 100644 index 3362769509..0000000000 --- a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePagePartial.png +++ /dev/null |
