Skip to content

Commit

Permalink
fix build attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
grantcopley committed Oct 20, 2023
1 parent bd11486 commit 0bbab2c
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 65 deletions.
24 changes: 0 additions & 24 deletions test-harness/modules_app/TestModule/ModuleConfig.cfc

This file was deleted.

5 changes: 0 additions & 5 deletions test-harness/modules_app/TestModule/views/hello/world.cfm

This file was deleted.

10 changes: 0 additions & 10 deletions test-harness/modules_app/TestModule/wires/HelloWorld.cfc

This file was deleted.

6 changes: 0 additions & 6 deletions test-harness/modules_app/TestModule/wires/HelloWorld.cfm

This file was deleted.

18 changes: 0 additions & 18 deletions test-harness/modules_app/TestModule/wires/InlineHelloWorld.cfm

This file was deleted.

53 changes: 53 additions & 0 deletions test-harness/modules_app/testingmodule/ModuleConfig.cfc
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
component {

// Module Properties
this.title = "testingmodule";
this.author = "";
this.webURL = "";
this.description = "";
this.version = "1.0.0";
// If true, looks for views in the parent first, if not found, then in the module. Else vice-versa
this.viewParentLookup = true;
// If true, looks for layouts in the parent first, if not found, then in module. Else vice-versa
this.layoutParentLookup = true;
// Module Entry Point
this.entryPoint = "testingmodule";
// Inherit Entry Point
this.inheritEntryPoint = false;
// Model Namespace
this.modelNamespace = "testingmodule";
// CF Mapping
this.cfmapping = "testingmodule";
// Auto-map models
this.autoMapModels = true;
// Module Dependencies
this.dependencies = [];

function configure(){

// parent settings
parentSettings = {

};

settings = {

};

layoutSettings = {
defaultLayout = "Main.cfm"
};

routes = [];

resources = [];

interceptorSettings = {
customInterceptionPoints = ""
};

interceptors = [];

}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<cfscript>
data = {
"title": "Nested module component"
}
</cfscript>

<cfoutput>
<div>
#title#
</div>
</cfoutput>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<cfscript>
data = {
"title": "Nested module component using default wires location"
}
</cfscript>

<cfoutput>
<div>
#title#
</div>
</cfoutput>
4 changes: 2 additions & 2 deletions test-harness/tests/specs/CBWIRESpec.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -1082,12 +1082,12 @@ component extends="coldbox.system.testing.BaseTestCase" {
} );

it( "can render component from nested module folder using wire()", function() {
var result = service.wire( "myComponents.NestedModuleComponent@testmodule" );
var result = service.wire( "myComponents.NestedModuleComponent@testingmodule" );
expect( result ).toContain( "Nested module component" );
} );

it( "can render component from nested module using default wires location", function() {
var result = service.wire( "NestedModuleDefaultComponent@testmodule" );
var result = service.wire( "NestedModuleDefaultComponent@testingmodule" );
expect( result ).toContain( "Nested module component using default wires location" );
} );

Expand Down

0 comments on commit 0bbab2c

Please sign in to comment.