feat(core): fs.assert trim when match content

adaltas · Feb 26, 2021 · e7e0262 · e7e0262
1 parent 3022c14
commit e7e0262
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 6 deletions.
diff --git a/packages/core/lib/actions/fs/assert.js b/packages/core/lib/actions/fs/assert.js
diff --git a/packages/core/lib/actions/log/md.js b/packages/core/lib/actions/log/md.js
diff --git a/packages/core/src/actions/fs/assert.coffee.md b/packages/core/src/actions/fs/assert.coffee.md
@@ -186,6 +186,7 @@ console.info(`File exists: ${status}`)
  {data} = await @fs.base.readFile config.target
  for filter in config.filter or []
  data = filter[Symbol.replace] data, ''
+ data = utils.buffer.trim data, config.encoding if config.trim
  unless config.not
  unless config.content.test data
  throw errors.NIKITA_FS_ASSERT_CONTENT_UNMATCH config: config, expect: data

diff --git a/packages/core/src/actions/log/md.coffee.md b/packages/core/src/actions/log/md.coffee.md
@@ -96,7 +96,7 @@ Write log to the host filesystem in Markdown.
  state.last_event_type = 'text'
  content = []
  content.push "\n#{log.message}"
- content.push " (#{log.depth}.#{log.level}, written by #{log.module})" if log.module
+ content.push " (#{log.depth}.#{log.level}, written by #{log.module})" if log.module and log.module isnt '@nikitajs/core/src/actions/call'
  content.push "\n"
  content.join ''
 

diff --git a/packages/core/test/actions/fs/assert.coffee b/packages/core/test/actions/fs/assert.coffee
@@ -533,7 +533,7 @@ describe 'actions.fs.assert', ->
 
  describe 'config `trim`', ->
 
- they 'trim target', ({ssh}) ->
+ they 'on target against content string', ({ssh}) ->
  nikita
  ssh: ssh
  metadata: tmpdir: true
@@ -543,8 +543,30 @@ describe 'actions.fs.assert', ->
  target: "#{tmpdir}/a_file"
  content: 'ok'
  trim: true
+
+ they 'on target against content buffer', ({ssh}) ->
+ nikita
+ ssh: ssh
+ metadata: tmpdir: true
+ , ({metadata: {tmpdir}}) ->
+ @fs.base.writeFile "#{tmpdir}/a_file", content: '\nok\n'
+ @fs.assert
+ target: "#{tmpdir}/a_file"
+ content: Buffer.from 'ok'
+ trim: true
+
+ they 'on target against content regexp', ({ssh}) ->
+ nikita
+ ssh: ssh
+ metadata: tmpdir: true
+ , ({metadata: {tmpdir}}) ->
+ @fs.base.writeFile "#{tmpdir}/a_file", content: '\nok\n'
+ @fs.assert
+ target: "#{tmpdir}/a_file"
+ content: /^ok$/
+ trim: true
 
- they 'trim content string', ({ssh}) ->
+ they 'with content string', ({ssh}) ->
  nikita
  ssh: ssh
  metadata: tmpdir: true
@@ -555,7 +577,7 @@ describe 'actions.fs.assert', ->
  content: '\nok\n'
  trim: true
 
- they 'trim content buffer', ({ssh}) ->
+ they 'with content buffer', ({ssh}) ->
  nikita
  ssh: ssh
  metadata: tmpdir: true

diff --git a/packages/core/test/actions/log/md.coffee b/packages/core/test/actions/log/md.coffee
@@ -31,7 +31,7 @@ describe 'actions.log.md', ->
  /^Entering.*$/mg
  ]
  target: "#{tmpdir}/localhost.log"
- content: "ok"
+ content: 'ok'
 
  they 'write message and module', ({ssh}) ->
  nikita
@@ -70,6 +70,7 @@ describe 'actions.log.md', ->
  trim: true
  filter: [
  /^Entering.*$/mg
+ /^\n$/mg
  ]
  target: "#{tmpdir}/localhost.log"
  content: """
@@ -95,6 +96,7 @@ describe 'actions.log.md', ->
  trim: true
  filter: [
  /^Entering.*$/mg
+ /^\n$/mg
  ]
  target: "#{tmpdir}/localhost.log"
  content: """