chore: specify coffee fixtures / convert others (#9433)

cypress-io · Dec 4, 2020 · 0243c4d · 0243c4d · cypress-bot · Dec 4, 2020
1 parent c42667e
commit 0243c4d
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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/...projects/todos/tests/_fixtures/bar.coffee → ...s/todos/tests/_fixtures/bar_coffee.coffee b/...projects/todos/tests/_fixtures/bar.coffee → ...s/todos/tests/_fixtures/bar_coffee.coffee
diff --git a/...ts/todos/tests/_fixtures/no_format.coffee → ...s/tests/_fixtures/no_format_coffee.coffee b/...ts/todos/tests/_fixtures/no_format.coffee → ...s/tests/_fixtures/no_format_coffee.coffee
diff --git a/.../tests/_fixtures/trailing_new_line.coffee → ..._fixtures/trailing_new_line_coffee.coffee b/.../tests/_fixtures/trailing_new_line.coffee → ..._fixtures/trailing_new_line_coffee.coffee
diff --git a/...ects/todos/tests/_fixtures/account.coffee → ...s/tests/_fixtures/valid_coffee_obj.coffee b/...ects/todos/tests/_fixtures/account.coffee → ...s/tests/_fixtures/valid_coffee_obj.coffee
diff --git a/...rver/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.coffee b/...rver/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.coffee
diff --git a/...s/server/test/support/fixtures/projects/uncaught-support-file/cypress/integration/spec.js b/...s/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
@@ -219,17 +219,17 @@ 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: [],
         })
       })
     })
 
     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
@@ -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')
           })
         })