From 83591d6ff9c4ac3104fa08a449008dc392f72a90 Mon Sep 17 00:00:00 2001 From: Yaroslav Admin Date: Sun, 19 Apr 2020 14:25:43 +0200 Subject: [PATCH] chore(test): remove @not-jenkins tag for Cucumber tests This tag was useful long time ago, when most of the tests were run using PhantomJS. For a long time E2E tests use ChromeHeadless as a the main browser and it is not needed to mark tests using Google Chrome to only run locally. Two removed test cases have identical cases above them, which are run in the ChromeHeadless and other two were updated to run in ChromeHeadless instead of Chrome and will be run both in CI as well as locally. --- cucumber.js | 3 +-- test/e2e/basic.feature | 17 ----------------- test/e2e/runInParent.feature | 21 --------------------- test/e2e/tag.feature | 12 ++++++------ 4 files changed, 7 insertions(+), 46 deletions(-) diff --git a/cucumber.js b/cucumber.js index d3c954bbf..90677cdef 100644 --- a/cucumber.js +++ b/cucumber.js @@ -5,8 +5,7 @@ const options = [ '--require test/e2e/support/env.js', '--require test/e2e/support/world.js', '--require test/e2e/step_definitions/core_steps.js', - '--require test/e2e/step_definitions/hooks.js', - '--tags "not @not-jenkins"' + '--require test/e2e/step_definitions/hooks.js' ] module.exports = { diff --git a/test/e2e/basic.feature b/test/e2e/basic.feature index 8246e21e6..413648f62 100644 --- a/test/e2e/basic.feature +++ b/test/e2e/basic.feature @@ -19,23 +19,6 @@ Feature: Basic Testrunner .. Chrome Headless """ - @not-jenkins - Scenario: Execute a test in Chrome - Given a configuration with: - """ - files = ['basic/plus.js', 'basic/test.js'] - browsers = ['Chrome'] - plugins = [ - 'karma-jasmine', - 'karma-chrome-launcher' - ] - """ - When I start Karma - Then it passes with: - """ - .. - Chrome - """ Scenario: Execute a test in Firefox Given a configuration with: diff --git a/test/e2e/runInParent.feature b/test/e2e/runInParent.feature index 149a796c6..2bd59b321 100644 --- a/test/e2e/runInParent.feature +++ b/test/e2e/runInParent.feature @@ -23,27 +23,6 @@ Feature: runInParent option .. Chrome Headless """ - @not-jenkins - Scenario: Execute a test in Chrome - Given a configuration with: - """ - files = ['basic/plus.js', 'basic/test.js'] - browsers = ['Chrome'] - plugins = [ - 'karma-jasmine', - 'karma-chrome-launcher' - ] - client = { - useIframe: false, - runInParent: true - } - """ - When I start Karma - Then it passes with: - """ - .. - Chrome - """ Scenario: Execute a test in Firefox Given a configuration with: diff --git a/test/e2e/tag.feature b/test/e2e/tag.feature index 960fa0f10..d51ab5f2b 100644 --- a/test/e2e/tag.feature +++ b/test/e2e/tag.feature @@ -19,12 +19,12 @@ Feature: JavaScript Tag . Firefox """ - @not-jenkins - Scenario: Execute a test in Chrome with version, without JavaScript tag + + Scenario: Execute a test in ChromeHeadless with version, without JavaScript tag Given a configuration with: """ files = ['tag/tag.js', 'tag/test-with-version.js']; - browsers = ['Chrome']; + browsers = ['ChromeHeadlessNoSandbox']; plugins = [ 'karma-jasmine', 'karma-chrome-launcher' @@ -53,12 +53,12 @@ Feature: JavaScript Tag . Firefox """ - @not-jenkins - Scenario: Execute a test in Chrome without version, without JavaScript tag + + Scenario: Execute a test in ChromeHeadless without version, without JavaScript tag Given a configuration with: """ files = ['tag/tag.js', 'tag/test-without-version.js']; - browsers = ['Chrome']; + browsers = ['ChromeHeadlessNoSandbox']; plugins = [ 'karma-jasmine', 'karma-chrome-launcher'