From 6baadd25af39747de80343acc32ae87c0b46a1b8 Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Thu, 3 Dec 2020 11:52:37 +0630 Subject: [PATCH] rename fixtures that are required to be coffee files for tests --- .../__snapshots__/6_uncaught_support_file_spec.js | 14 +++++++------- packages/server/lib/project.js | 4 ++-- packages/server/lib/util/specs.js | 6 +++--- .../_fixtures/{bar.coffee => bar_coffee.coffee} | 0 .../{no_format.coffee => no_format_coffee.coffee} | 0 ...line.coffee => trailing_new_line_coffee.coffee} | 0 .../{account.coffee => valid_coffee_obj.coffee} | 0 .../cypress/integration/spec.coffee | 1 - .../cypress/integration/spec.js | 1 + packages/server/test/unit/fixture_spec.js | 12 ++++++------ packages/server/test/unit/socket_spec.js | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) rename packages/server/test/support/fixtures/projects/todos/tests/_fixtures/{bar.coffee => bar_coffee.coffee} (100%) rename packages/server/test/support/fixtures/projects/todos/tests/_fixtures/{no_format.coffee => no_format_coffee.coffee} (100%) rename packages/server/test/support/fixtures/projects/todos/tests/_fixtures/{trailing_new_line.coffee => trailing_new_line_coffee.coffee} (100%) rename packages/server/test/support/fixtures/projects/todos/tests/_fixtures/{account.coffee => valid_coffee_obj.coffee} (100%) delete mode 100644 packages/server/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.coffee create mode 100644 packages/server/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.js diff --git a/packages/server/__snapshots__/6_uncaught_support_file_spec.js b/packages/server/__snapshots__/6_uncaught_support_file_spec.js index 33f31a7008c7..1964cebd504a 100644 --- a/packages/server/__snapshots__/6_uncaught_support_file_spec.js +++ b/packages/server/__snapshots__/6_uncaught_support_file_spec.js @@ -7,13 +7,13 @@ exports['e2e uncaught support file errors failing 1'] = ` ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ │ Cypress: 1.2.3 │ │ Browser: FooBrowser 88 │ - │ Specs: 1 found (spec.coffee) │ + │ Specs: 1 found (spec.js) │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ ──────────────────────────────────────────────────────────────────────────────────────────────────── - Running: spec.coffee (1 of 1) + Running: spec.js (1 of 1) 1) An uncaught error was detected outside of a test @@ -47,20 +47,20 @@ We dynamically generated a new test to display this failure. │ Screenshots: 1 │ │ Video: true │ │ Duration: X seconds │ - │ Spec Ran: spec.coffee │ + │ Spec Ran: spec.js │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/spec.coffee/An uncaught error was detected outs (YxX) - ide of a test (failed).png + - /XXX/XXX/XXX/cypress/screenshots/spec.js/An uncaught error was detected outside (YxX) + of a test (failed).png (Video) - Started processing: Compressing to 32 CRF - - Finished processing: /XXX/XXX/XXX/cypress/videos/spec.coffee.mp4 (X second) + - Finished processing: /XXX/XXX/XXX/cypress/videos/spec.js.mp4 (X second) ==================================================================================================== @@ -70,7 +70,7 @@ We dynamically generated a new test to display this failure. Spec Tests Passing Failing Pending Skipped ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✖ spec.coffee XX:XX 1 - 1 - - │ + │ ✖ spec.js XX:XX 1 - 1 - - │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ ✖ 1 of 1 failed (100%) XX:XX 1 - 1 - - diff --git a/packages/server/lib/project.js b/packages/server/lib/project.js index 1d9e598ea28a..89582e08fb61 100644 --- a/packages/server/lib/project.js +++ b/packages/server/lib/project.js @@ -519,9 +519,9 @@ class Project extends EE { // example: // // /Users/bmann/Dev/cypress-app/.projects/cypress/integration - // /Users/bmann/Dev/cypress-app/.projects/cypress/integration/foo.coffee + // /Users/bmann/Dev/cypress-app/.projects/cypress/integration/foo.js // - // becomes /integration/foo.coffee + // becomes /integration/foo.js const folderToUse = type === 'integration' ? integrationFolder : componentFolder diff --git a/packages/server/lib/util/specs.js b/packages/server/lib/util/specs.js index 3199eb0522af..d5acdccd582d 100644 --- a/packages/server/lib/util/specs.js +++ b/packages/server/lib/util/specs.js @@ -85,10 +85,10 @@ function findSpecsOfType (searchOptions, specPattern) { } // example of resolved paths in the returned spec object - // filePath = /Users/bmann/Dev/my-project/cypress/integration/foo.coffee + // filePath = /Users/bmann/Dev/my-project/cypress/integration/foo.js // integrationFolderPath = /Users/bmann/Dev/my-project/cypress/integration - // relativePathFromSearchFolder = foo.coffee - // relativePathFromProjectRoot = cypress/integration/foo.coffee + // relativePathFromSearchFolder = foo.js + // relativePathFromProjectRoot = cypress/integration/foo.js const relativePathFromSearchFolder = (file) => { return path.relative(searchFolderPath, file) diff --git a/packages/server/test/support/fixtures/projects/todos/tests/_fixtures/bar.coffee b/packages/server/test/support/fixtures/projects/todos/tests/_fixtures/bar_coffee.coffee similarity index 100% rename from packages/server/test/support/fixtures/projects/todos/tests/_fixtures/bar.coffee rename to packages/server/test/support/fixtures/projects/todos/tests/_fixtures/bar_coffee.coffee diff --git a/packages/server/test/support/fixtures/projects/todos/tests/_fixtures/no_format.coffee b/packages/server/test/support/fixtures/projects/todos/tests/_fixtures/no_format_coffee.coffee similarity index 100% rename from packages/server/test/support/fixtures/projects/todos/tests/_fixtures/no_format.coffee rename to packages/server/test/support/fixtures/projects/todos/tests/_fixtures/no_format_coffee.coffee diff --git a/packages/server/test/support/fixtures/projects/todos/tests/_fixtures/trailing_new_line.coffee b/packages/server/test/support/fixtures/projects/todos/tests/_fixtures/trailing_new_line_coffee.coffee similarity index 100% rename from packages/server/test/support/fixtures/projects/todos/tests/_fixtures/trailing_new_line.coffee rename to packages/server/test/support/fixtures/projects/todos/tests/_fixtures/trailing_new_line_coffee.coffee diff --git a/packages/server/test/support/fixtures/projects/todos/tests/_fixtures/account.coffee b/packages/server/test/support/fixtures/projects/todos/tests/_fixtures/valid_coffee_obj.coffee similarity index 100% rename from packages/server/test/support/fixtures/projects/todos/tests/_fixtures/account.coffee rename to packages/server/test/support/fixtures/projects/todos/tests/_fixtures/valid_coffee_obj.coffee diff --git a/packages/server/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.coffee b/packages/server/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.coffee deleted file mode 100644 index cb7fd2ecf0eb..000000000000 --- a/packages/server/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.coffee +++ /dev/null @@ -1 +0,0 @@ -it "foo", -> diff --git a/packages/server/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.js b/packages/server/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.js new file mode 100644 index 000000000000..3d6df5aee9e4 --- /dev/null +++ b/packages/server/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.js @@ -0,0 +1 @@ +it('foo', () => { }) diff --git a/packages/server/test/unit/fixture_spec.js b/packages/server/test/unit/fixture_spec.js index eeab4575a62d..365774a6468d 100644 --- a/packages/server/test/unit/fixture_spec.js +++ b/packages/server/test/unit/fixture_spec.js @@ -219,8 +219,8 @@ ParseError: Unterminated string constant\ context('coffee files', () => { it('returns valid coffee object', function () { - return fixture.get(this.fixturesFolder, 'account.coffee').then((account) => { - expect(account).to.deep.eq({ + return fixture.get(this.fixturesFolder, 'valid_coffee_obj.coffee').then((coffeeObj) => { + expect(coffeeObj).to.deep.eq({ name: 'cypress', users: [], }) @@ -228,8 +228,8 @@ ParseError: Unterminated string constant\ }) it('does not rewrite coffee files', function () { - return fixture.get(this.fixturesFolder, 'no_format.coffee').then(() => { - return fs.readFileAsync(`${this.fixturesFolder}/no_format.coffee`, 'utf8').then((str) => { + return fixture.get(this.fixturesFolder, 'no_format_coffee.coffee').then(() => { + return fs.readFileAsync(`${this.fixturesFolder}/no_format_coffee.coffee`, 'utf8').then((str) => { expect(str).to.eq(`\ [ {id: 1} @@ -453,8 +453,8 @@ John,Chef,1982 }) it('does not remove trailing new lines on .coffee', function () { - return fixture.get(this.fixturesFolder, 'trailing_new_line.coffee').then((str) => { - return fs.readFileAsync(`${this.fixturesFolder}/trailing_new_line.coffee`, 'utf8').then((str2) => { + return fixture.get(this.fixturesFolder, 'trailing_new_line_coffee.coffee').then((str) => { + return fs.readFileAsync(`${this.fixturesFolder}/trailing_new_line_coffee.coffee`, 'utf8').then((str2) => { expect(str2).to.eq('{ foo: "bar" }\n') }) }) diff --git a/packages/server/test/unit/socket_spec.js b/packages/server/test/unit/socket_spec.js index 166595a3e6c5..9aedd3cbef10 100644 --- a/packages/server/test/unit/socket_spec.js +++ b/packages/server/test/unit/socket_spec.js @@ -702,8 +702,8 @@ describe('lib/socket', () => { }) it('calls statAsync on .coffee file', function () { - return this.socket.onTestFileChange('foo/bar.coffee').then(() => { - expect(fs.statAsync).to.be.calledWith('foo/bar.coffee') + return this.socket.onTestFileChange('foo/bar_coffee.coffee').then(() => { + expect(fs.statAsync).to.be.calledWith('foo/bar_coffee.coffee') }) })