UT: fix stub operations (losing coverage percent)

src/cli/cms/data/regex.js

@@ -95,4 +95,18 @@ export function getTagAbeWithTab(text, tab) {
 
 export function validDataAbe(str){
   return str.replace(/\[([0-9]*)\]/g, '$1')
+}
+
+export function getWorkflowFromOperationsUrl(str){
+  let regUrl = /\/abe\/operations\/(.*?)\/(.*?)\//
+  var workflow = 'draft'
+  var match = str.match(regUrl)
+  if (match != null && match[1] != null) {
+    workflow = match[1]
+  }
+  var postUrl = str.replace(regUrl, '')
+  return {
+    workflow: workflow,
+    postUrl: postUrl
+  }
 }

src/cli/cms/editor/handlebars/listPage.js

@@ -66,15 +66,15 @@ export default function listPage(file, index, text) {
             <div class="row icons-action">`
 
   if(file.publish != null) {
-    res += `<a href="/abe/unpublish${file.abe_meta.link}"
+    res += `<a href="/abe/operations/${file.abe_meta.status}/unpublish${file.abe_meta.link}"
                title="${text.unpublish}"
                class="icon" data-unpublish="true" data-text="${text.confirmUnpublish} ${file.abe_meta.link}"
                title="unpublish">
               <span class="glyphicon glyphicon-eye-close"></span>
             </a>`
   }
 
-  res += `<a href="/abe/delete${file.abe_meta.link}"
+  res += `<a href="/abe/operations/${file.abe_meta.status}/delete${file.abe_meta.link}"
              title="${text.delete}"
              class="icon"
              data-delete="true"

src/cli/cms/operations/create.js

@@ -32,10 +32,10 @@ var create = function(template, pathCreate, name, req, forceJson = {}, duplicate
       var templateText = cmsTemplates.template.getTemplate(template)
       json = cmsData.values.removeDuplicate(templateText, json)
     }
+
     var resHook = abeExtend.hooks.instance.trigger('beforeFirstSave', postUrl, req.body, json)
     postUrl = resHook.postUrl
     json = resHook.json
-
     var p2 = cmsOperations.post.draft(
       postUrl,
       json,

src/cli/cms/operations/post.js

@@ -104,7 +104,7 @@ export function unpublish(filePath) {
         delete json.abe_meta.publish
       }
 
-      var p = draft(
+      var p = cmsOperations.post.draft(
         filePath, 
         json,
         'draft'
@@ -147,7 +147,7 @@ export function reject(filePath, json, workflow) {
     if(json.abe_meta.publish != null) {
       delete json.abe_meta.publish
     }
-    var p2 = draft(
+    var p2 = cmsOperations.post.draft(
         filePath, 
         json,
         rejectToWorkflow

src/cli/users/utils.js

@@ -244,7 +244,7 @@ export function getUserWorkflow(status, role) {
     type = (type != null) ? type : flow
     return {
       status: flow,
-      url: `/abe/save/${type}/${action}`
+      url: `/abe/operations/${type}/${action}`
     }
   }
 

src/server/controllers/index.js

@@ -13,8 +13,6 @@ import {
   ,getGeneratePost
   ,operations
   ,getSaveConfig
-  ,getUnpublish
-  ,getDelete
   ,postUpload
   ,postSqlRequest
   ,postReference
@@ -57,8 +55,6 @@ router.post('/abe/page/*', postPage)
 router.get('/abe/page/*', getPage)
 router.get('/abe/generate-posts', getGeneratePost)
 router.get('/abe/save-config', getSaveConfig)
-router.get('/abe/unpublish*', getUnpublish)
-router.get('/abe/delete*', getDelete)
 router.get('/abe/reference/*', getReference)
 router.get('/abe/thumbs/*', getThumbs)
 router.get('/abe/image/*', getImage)
@@ -74,9 +70,11 @@ router.get('/abe/list-hooks*', getListHooks)
 
 var workflows = config.users.workflow
 Array.prototype.forEach.call(workflows, (workflow) => {
-  router.post(`/abe/save/${workflow}/reject*`, operations.postReject)
-  router.post(`/abe/save/${workflow}/submit*`, operations.postSubmit)
-  router.post(`/abe/save/${workflow}/edit*`, operations.postSubmit)
+  router.get(`/abe/operations/${workflow}/unpublish*`, operations.getUnpublish)
+  router.get(`/abe/operations/${workflow}/delete*`, operations.getDelete)
+  router.post(`/abe/operations/${workflow}/reject*`, operations.postReject)
+  router.post(`/abe/operations/${workflow}/submit*`, operations.postSubmit)
+  router.post(`/abe/operations/${workflow}/edit*`, operations.postSubmit)
 })
 
 var routes = abeExtend.plugins.instance.getRoutes()

src/server/routes/index.js

@@ -9,8 +9,6 @@ import getPage from './get-page'
 import postPage from './post-page'
 import getGeneratePost from './get-generate-posts'
 import getSaveConfig from './get-save-config'
-import getUnpublish from './get-unpublish'
-import getDelete from './get-delete'
 import postUpload from './post-upload'
 import postSqlRequest from './post-sql-request'
 import postReference from './post-reference'
@@ -33,8 +31,6 @@ export {
 	postPage,
 	getGeneratePost,
 	getSaveConfig,
-	getUnpublish,
-	getDelete,
 	postUpload,
 	postSqlRequest,
 	postReference,

src/server/routes/get-delete.js → src/server/routes/operations/get/delete.js

@@ -1,19 +1,20 @@
 import {
-  abeExtend,
-  cmsOperations
-} from '../../cli'
+  abeExtend
+  ,cmsOperations
+  ,cmsData
+} from '../../../../cli'
 
 var route = function(req, res, next){
   abeExtend.hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
 
-  var filepath = req.originalUrl.replace('/abe/delete', '')
+  var operation = cmsData.regex.getWorkflowFromOperationsUrl(req.originalUrl)
 
-  cmsOperations.remove.remove(filepath)
+  cmsOperations.remove.remove(operation.postUrl)
 
   var result = {
     success: 1,
-    file: filepath
+    file: operation.postUrl
   }
   res.set('Content-Type', 'application/json')
   res.send(JSON.stringify(result))

src/server/routes/get-unpublish.js → src/server/routes/operations/get/unpublish.js

@@ -1,18 +1,20 @@
 import {
   cmsOperations
   ,abeExtend
-} from '../../cli'
+  ,cmsData
+} from '../../../../cli'
 
 var route = function(req, res, next){
   abeExtend.hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
 
-  var filepath = req.originalUrl.replace('/abe/unpublish', '')
-  cmsOperations.post.unpublish(filepath)
+  var operation = cmsData.regex.getWorkflowFromOperationsUrl(req.originalUrl)
+
+  cmsOperations.post.unpublish(operation.postUrl)
 
   var result = {
     success: 1,
-    file: filepath
+    file: operation.postUrl
   }
   res.set('Content-Type', 'application/json')
   res.send(JSON.stringify(result))

src/server/routes/operations/index.js

@@ -1,7 +1,11 @@
+import getUnpublish from './get/unpublish'
+import getDelete from './get/delete'
 import postSubmit from './post/submit'
 import postReject from './post/reject'
 
 export {
 	postSubmit
 	,postReject
+	,getUnpublish
+	,getDelete
 }

src/server/routes/operations/post/reject.js

@@ -1,24 +1,19 @@
 import {
-  cmsOperations,
-  abeExtend
+  cmsOperations
+  ,abeExtend
+  ,cmsData
 } from '../../../../cli'
 
 var route = function(req, res, next){
   abeExtend.hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
 
-  let regUrl = /\/abe\/save\/(.*?)\/reject\//
-  var workflow = 'draft'
-  var match = req.originalUrl.match(regUrl)
-  if (match != null && match[1] != null) {
-    workflow = match[1]
-  }
-  var postUrl = req.originalUrl.replace(regUrl, '')
-
+  var operation = cmsData.regex.getWorkflowFromOperationsUrl(req.originalUrl)
+
   var p = cmsOperations.post.reject(
-    postUrl, 
+    operation.postUrl, 
     req.body.json,
-    workflow
+    operation.workflow
   )
 
   p.then((result) => {

src/server/routes/operations/post/submit.js

@@ -1,32 +1,26 @@
 import {
-  cmsOperations,
-  abeExtend
+  cmsOperations
+  ,abeExtend
+  ,cmsData
 } from '../../../../cli'
 
 var route = function(req, res, next){
   abeExtend.hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
 
-  let regUrl = /\/abe\/save\/(.*?)\/submit\//
-  var workflow = 'draft'
-  var match = req.originalUrl.match(regUrl)
-  if (match != null && match[1] != null) {
-    workflow = match[1]
-  }
-  var postUrl = req.originalUrl.replace(regUrl, '')
-  var json = req.body.json
-
+  var operation = cmsData.regex.getWorkflowFromOperationsUrl(req.originalUrl)
+
   var p
-  if (workflow === 'publish') {
+  if (operation.workflow === 'publish') {
     p = cmsOperations.post.publish(
-      postUrl, 
-      json
+      operation.postUrl, 
+      req.body.json
     )
   }else {
     p = cmsOperations.post.draft(
-      postUrl, 
-      json, 
-      workflow
+      operation.postUrl, 
+      req.body.json, 
+      operation.workflow
     )
   }
 

test/regex.js → test/cms/data/regex.js

@@ -1,22 +1,22 @@
 var chai = require('chai');
 var path = require('path');
 
-var config = require('../src/cli').config
-config.set({root: path.join(__dirname,'fixtures')})
+var config = require('../../../src/cli').config
+config.set({root: path.join(process.cwd(), 'test', 'fixtures')})
 
-var cmsData = require('../src/cli').cmsData
-var Manager = require('../src/cli').Manager;
+var cmsData = require('../../../src/cli').cmsData
+var Manager = require('../../../src/cli').Manager;
 var fse = require('fs-extra');
 
-describe('Request', function() {
+describe('regex', function() {
   before( function(done) {
     Manager.instance.init()
       .then(function () {
 
         this.fixture = {
-          articleSingle: fse.readFileSync(path.join(__dirname, 'fixtures', 'templates', 'article-single-abe.html'), 'utf8'),
-          articleEach: fse.readFileSync(path.join(__dirname, 'fixtures', 'templates', 'article-each-abe.html'), 'utf8'),
-          articleRequest: fse.readFileSync(path.join(__dirname, 'fixtures', 'templates', 'article-request.html'), 'utf8')
+          articleSingle: fse.readFileSync(path.join(process.cwd(), 'test', 'fixtures', 'templates', 'article-single-abe.html'), 'utf8'),
+          articleEach: fse.readFileSync(path.join(process.cwd(), 'test', 'fixtures', 'templates', 'article-each-abe.html'), 'utf8'),
+          articleRequest: fse.readFileSync(path.join(process.cwd(), 'test', 'fixtures', 'templates', 'article-request.html'), 'utf8')
         }
         done()