refactor(view): move inbuilt globals to a new file

src/View/Form/index.js

@@ -18,8 +18,8 @@ const _ = require('lodash')
  */
 class Form {
 
-  constructor (View, Route) {
-    this.env = View.viewsEnv
+  constructor (viewsEnv, Route) {
+    this.env = viewsEnv
     this.specialKeywords = ['url', 'files', 'method', 'route', 'action', 'params']
     this.validFormMethods = ['GET', 'POST']
     this.route = Route

src/View/globals.js

@@ -0,0 +1,16 @@
+'use strict'
+
+/**
+ * adonis-framework
+ *
+ * (c) Harminder Virk <virk@adonisjs.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+*/
+
+const Form = require('./Form')
+
+module.exports = function (env, Route) {
+  env.addGlobal('form', new Form(env, Route))
+}

src/View/index.js

@@ -11,9 +11,9 @@
 
 const nunjucks = require('nunjucks')
 const ViewLoader = require('./loader')
-const Form = require('./Form')
 const viewFilters = require('./filters')
 const viewExtensions = require('./extensions')
+const viewGlobals = require('./globals')
 
 /**
  * View class for adonis framework to serve jinja like views
@@ -26,8 +26,8 @@ class View {
     const viewsPath = Helpers.viewsPath()
     const viewsCache = Config.get('app.views.cache', true)
     this.viewsEnv = new nunjucks.Environment(new ViewLoader(viewsPath, false, !viewsCache))
-    this.global('form', new Form(this, Route))
     viewExtensions(this.viewsEnv)
+    viewGlobals(this.viewsEnv, Route)
     viewFilters(this.viewsEnv, Route)
   }
 

test/unit/view.form.spec.js

@@ -27,7 +27,7 @@ const Config = {
   }
 }
 
-const form = new Form(new View(Helpers, Config, Route), Route)
+const form = new Form(new View(Helpers, Config, Route).viewsEnv, Route)
 
 describe('Form Helper', function () {
   it('should be able to create a form opening tag using open method', function () {
@@ -138,7 +138,7 @@ describe('Form Helper', function () {
     view.global('old', function () {
       return 'some value'
     })
-    const formNew = new Form(view, Route)
+    const formNew = new Form(view.viewsEnv, Route)
     const label = formNew.text('username')
     expect(label.val).to.equal('<input type="text" name="username" value="some value" id="username" />')
   })
@@ -148,7 +148,7 @@ describe('Form Helper', function () {
     view.global('old', function () {
       return 'some value'
     })
-    const formNew = new Form(view, Route)
+    const formNew = new Form(view.viewsEnv, Route)
     const input = formNew.text('username', null, {avoidOld: true})
     expect(input.val).to.equal('<input type="text" name="username" id="username" />')
   })