From 3e31b91b1123fcace22736a737e17457372e6092 Mon Sep 17 00:00:00 2001 From: cmrd Senya Date: Sat, 2 Sep 2017 22:37:04 +0300 Subject: [PATCH] Add @nophantomjs tag to default cucumber profile Use this tag for tests which can't work with PhantomJS, but which we can run with Selenium using some other profile (not implemented here). closes #6418 --- Changelog.md | 1 + config/cucumber.yml | 4 ++-- features/desktop/media-embed.feature | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8be378cab..d10638702 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ ## Bug fixes ## Features +* Add basic html5 audio/video embedding support [#6418](https://github.com/diaspora/diaspora/pull/6418) # 0.7.3.1 diff --git a/config/cucumber.yml b/config/cucumber.yml index cace674ba..977c9d5ae 100644 --- a/config/cucumber.yml +++ b/config/cucumber.yml @@ -9,11 +9,11 @@ screenshot_opts = "--require features --format pretty" %> # 'normal' test runs -default: <%= std_opts %> -r features +default: <%= std_opts %> -r features --tags ~@nophantomjs wip: -r features --tags @wip:3 --wip features rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip --tags ~@screenshots # screenshot feature ref_screens: "<%= screenshot_opts %> --tags @reference-screenshots" cmp_screens: "<%= screenshot_opts %> --tags @comparison-screenshots" -all_screens: "<%= screenshot_opts %> --tags @screenshots" \ No newline at end of file +all_screens: "<%= screenshot_opts %> --tags @screenshots" diff --git a/features/desktop/media-embed.feature b/features/desktop/media-embed.feature index 66df5dcce..07efef81d 100644 --- a/features/desktop/media-embed.feature +++ b/features/desktop/media-embed.feature @@ -1,3 +1,5 @@ + # We can create a separate cucumber profile that will run these tests with Selenium +@nophantomjs @javascript Feature: oembed In order to make videos easy accessible