cca tests cleanup

Author: Nick Balestra

packages/create-cycle-app/test/integration/createCycleApp.spec.js

@@ -11,7 +11,8 @@ describe('create-cycle-app', () => {
           path.resolve(__dirname, '../../index.js'),
           appName,
           '--flavour',
-          'cycle-scripts@1.0.3'
+          'cycle-scripts@1.0.3',
+          '--noyarn'
         ])
       ).toThrowError()
     })
@@ -35,7 +36,8 @@ describe('create-cycle-app', () => {
         path.resolve(__dirname, '../../index.js'),
         appName,
         '--flavor',
-        'cycle-scripts@1.0.3'
+        'cycle-scripts@1.0.3',
+        '--noyarn'
       ])
       dir = fs.readdirSync(appName)
       done()

packages/create-cycle-app/test/unit/createAppDir.spec.js

@@ -0,0 +1,24 @@
+jest.mock('fs')
+const fs = require('fs')
+jest.mock('../../src/isSafeToCreateApp')
+const isSafeToCreateApp = require('../../src/isSafeToCreateApp')
+
+const createAppDir = require('../../src/createAppDir')
+
+describe('createAppDir module', () => {
+  afterEach(() => {
+    fs.existsSync.mockClear()
+    isSafeToCreateApp.mockClear()
+  })
+
+  describe('when calling it and the directory does not exist', () => {
+    test('should create it', (done) => {
+      fs.existsSync.mockReturnValue(false)
+      createAppDir('./appFolder')
+      expect(fs.existsSync).toBeCalledWith('./appFolder')
+      expect(fs.mkdirSync).toBeCalledWith('./appFolder')
+      expect(isSafeToCreateApp).not.toBeCalled()
+      done()
+    })
+  })
+})

…app/test/unit/preparePackageJson.spec.js …-app/test/unit/createPackageJson.spec.jspackages/create-cycle-app/test/unit/preparePackageJson.spec.js renamed to packages/create-cycle-app/test/unit/createPackageJson.spec.js packages/create-cycle-app/test/unit/preparePackageJson.spec.js renamed to packages/create-cycle-app/test/unit/createPackageJson.spec.js

@@ -1,20 +1,23 @@
-const preparePackageJson = require('../../src/preparePackageJson')
+const createPackageJson = require('../../src/createPackageJson')
 jest.mock('fs')
 const fs = require('fs')
+jest.mock('console')
+const console = require('console')
+const chalk = require('chalk')
 
-describe('preparePackageJson module', () => {
+describe('createPackageJson module', () => {
   describe('when calling it', () => {
     test('should correctly prepare package.json and write it to disk', () => {
-      const callback = jest.fn()
-      preparePackageJson('testPath', 'testName', callback)
+      createPackageJson('testPath', 'testName')
 
       expect(fs.writeFileSync.mock.calls[0][0]).toBe('testPath/package.json')
       expect(fs.writeFileSync.mock.calls[0][1]).toBe(JSON.stringify({
         name: 'testName',
         version: '0.1.0',
         private: true
       }, null, 2))
-      expect(callback).toBeCalled()
+      expect(console.log).toHaveBeenCalledTimes(2)
+      expect(console.log).toHaveBeenCalledWith(chalk.green('Creating a new Cycle.js app in testPath.'))
     })
   })
 })

packages/create-cycle-app/test/unit/createProjectIn.spec.js

@@ -4,19 +4,13 @@ const inquirer = require('inquirer')
 
 describe('initQuedstion module', () => {
   describe('when calling it', () => {
-    test('should not prompt for question if a custom flavor is provided', () => {
-      const callback = jest.fn()
-      initQuestions('customFlavor', callback)
-      expect(callback).toBeCalledWith(false)
-      expect(inquirer.prompt).not.toBeCalled()
-    })
-    test('should prompt for question if no custom flavor is provided', () => {
+    test('should prompt for question', () => {
       const callback = jest.fn()
       const answer = {language: 'javascript', streamLib: 'xstream'}
       inquirer.prompt.mockReturnValue({
         then: jest.fn(answers => callback(answer))
       })
-      initQuestions(undefined, callback)
+      initQuestions(callback)
       expect(callback).toBeCalledWith(answer)
       expect(inquirer.prompt).toBeCalled()
     })

packages/create-cycle-app/test/unit/initQuestions.spec.js

@@ -7,16 +7,16 @@ const getPackageName = require('../../src/getPackageName')
 jest.mock('console')
 const consoleMock = require('console')
 const installScripts = require('../../src/installScripts')
-
+// installScripts(appFolder, appName, { flavor, verbose, answers: false })
 describe('installScripts module', () => {
-  test('should be a function with arity 5', () => {
+  test('should be a function with arity 3', () => {
     expect(typeof installScripts).toBe('function')
-    expect(installScripts.length).toBe(5)
+    expect(installScripts.length).toBe(3)
   })
 
   describe('when invoked with a flavor published on npm', () => {
     getPackageName.mockImplementation(name => name)
-    installScripts('./', 'appName', 'cycle-scripts')
+    installScripts('./', 'appName', { flavor: 'cycle-scripts', cli: 'npm' })
 
     test('should call getPackageName with the name of the npm module', () => {
       expect(getPackageName).toBeCalledWith('cycle-scripts')
@@ -31,7 +31,7 @@ describe('installScripts module', () => {
           '--save-exact',
           'cycle-scripts'
         ],
-        {'stdio': 'inherit'}
+        {'cwd': './', 'stdio': 'inherit'}
       )
     })
 
@@ -48,7 +48,7 @@ describe('installScripts module', () => {
 
   describe('when invoked with a local flavor', () => {
     getPackageName.mockImplementation(name => path.basename(name))
-    installScripts('./', 'appName', './cycle-scripts')
+    installScripts('./', 'appName', { flavor: './cycle-scripts', cli: 'npm' })
 
     test('should console log the correct information', () => {
       expect(consoleMock.log.mock.calls[4][0]).toContain(
@@ -57,13 +57,13 @@ describe('installScripts module', () => {
     })
 
     test('should call spawn with the correct arguments', () => {
-      expect(spawn.mock.calls[1][1][3]).toContain('/create-cycle-app/packages/create-cycle-app/cycle-scripts')
+      expect(spawn.mock.calls[1][1][3]).toContain('./cycle-scripts')
     })
   })
 
   describe('when invoked with a verbose flag', () => {
     getPackageName.mockImplementation(name => name)
-    installScripts('./', 'appName', 'cycle-scripts', true)
+    installScripts('./', 'appName', { flavor: 'cycle-scripts', verbose: true, cli: 'npm' })
 
     test('should call spawn with the correct arguments', () => {
       expect(spawn.mock.calls[2]).toMatchObject([
@@ -75,7 +75,7 @@ describe('installScripts module', () => {
           '--save-exact',
           'cycle-scripts'
         ],
-        {'stdio': 'inherit'}
+        {'cwd': './', 'stdio': 'inherit'}
       ])
     })
   })

packages/create-cycle-app/test/unit/installScripts.spec.js

@@ -1,6 +1,6 @@
 jest.mock('fs')
 const fs = require('fs')
-const isSafeToCreateProjectIn = require('../../src/isSafeToCreateProjectIn')
+const isSafeToCreateApp = require('../../src/isSafeToCreateApp')
 const whiteList = [
   '.DS_Store',
   'Thumbs.db',
@@ -11,19 +11,19 @@ const whiteList = [
   'LICENSE'
 ]
 
-describe('isSafeToCreateProjectIn module', () => {
+describe('isSafeToCreateApp module', () => {
   describe('when calling it with a directory containing files not white-listened', () => {
     test('should return false', () => {
       fs.readdirSync.mockImplementation(() => whiteList.concat('index.js'))
-      const isSafe = isSafeToCreateProjectIn('./someFolder')
+      const isSafe = isSafeToCreateApp('./someFolder')
       expect(isSafe).toBe(false)
     })
   })
 
   describe('when calling it with a directory containing only white-listened files', () => {
     test('should return true', () => {
       fs.readdirSync.mockImplementation(() => whiteList)
-      const isSafe = isSafeToCreateProjectIn('./someFolder')
+      const isSafe = isSafeToCreateApp('./someFolder')
       expect(isSafe).toBe(true)
     })
   })