Skip to content

Commit

Permalink
chore(test): remove @not-jenkins tag for Cucumber tests (#3479)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
devoto13 committed Apr 20, 2020
1 parent b52333d commit fd8c3a6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 46 deletions.
3 changes: 1 addition & 2 deletions cucumber.js
Expand Up @@ -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 = {
Expand Down
17 changes: 0 additions & 17 deletions test/e2e/basic.feature
Expand Up @@ -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:
Expand Down
21 changes: 0 additions & 21 deletions test/e2e/runInParent.feature
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/tag.feature
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit fd8c3a6

Please sign in to comment.