Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apps separate from sdk 1154 #1231

Merged
merged 17 commits into from
Mar 16, 2015
Merged

Apps separate from sdk 1154 #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
157aa75
Locating apps folder either as brjs-apps or as parallel to the sdk if…
ioanalianabalas Feb 17, 2015
c61a654
Added tests for allowing apps to be stored in the custom brjs-apps fo…
ioanalianabalas Feb 18, 2015
d39c391
Renamed 'primed' in test names to 'populated' for added clarity.
ioanalianabalas Feb 18, 2015
b680b30
Added test to use an entirely different temporary directory rather ju…
ioanalianabalas Feb 19, 2015
fb8b347
Fixed merge conflicts.
ioanalianabalas Feb 20, 2015
27f09fd
Using canonical file for getParentFile to work.
ioanalianabalas Feb 20, 2015
579e73e
Added new app localisation including modified tests and new template …
ioanalianabalas Feb 27, 2015
38033c7
Modified the build for brjs-sdk and improved message for the checkDir…
ioanalianabalas Feb 27, 2015
62a37a6
Added warn log for when both apps and brjs-apps are present and fixed…
ioanalianabalas Mar 2, 2015
62e8f7b
Improved log message.
ioanalianabalas Mar 2, 2015
dc77ad2
Fixed merge conflicts.
ioanalianabalas Mar 3, 2015
2c16540
Removed faiing install libgd line from .travis.yml.
ioanalianabalas Mar 3, 2015
fa65e8c
Revert "Removed faiing install libgd line from .travis.yml."
Mar 4, 2015
26ef8a9
adding some more tests and minor refactor of 'brjs-apps' work
Mar 4, 2015
1e0da5c
changing logging test so it logs the correct warning when brjs-apps a…
Mar 10, 2015
8ad0644
Modified findAppsFolder in BRJS.
ioanalianabalas Mar 11, 2015
8fcebcb
BrjsApplicationServer uses the BRJS instance to get the apps dir.
ioanalianabalas Mar 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 16 additions & 2 deletions ...-tests/src/test-integration/java/org/bladerunnerjs/spec/brjs/appserver/AppServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void initTestObjects() throws Exception {
.and(brjs).hasContentPlugins(new MockContentPlugin())
.and(brjs).hasBeenCreated()
.and(brjs).localeSwitcherHasContents("locale-forwarder.js")
.and(brjs).containsFolder("apps")
.and(brjs).containsFolder("brjs-apps")
.and(brjs).containsFolder("sdk/system-applications");
brjs.bladerunnerConf().setJettyPort(appServerPort);
brjs.bladerunnerConf().write();
Expand Down Expand Up @@ -237,6 +237,20 @@ public void newAppsAreAutomaticallyHostedWhenRunningCreateAppCommandFromADiffere
then(appServer).requestCanEventuallyBeMadeFor("/app1/");
}

@Test
public void newAppsAreAutomaticallyHostedWhenRunningCreateAppCommandFromADifferentModelInstanceAndOnlyAppsDirectoryExists() throws Exception
{
given(brjs).doesNotContainFolder("brjs-apps")
.and(brjs).containsFolder("apps")
.and(brjs).hasBeenAuthenticallyCreatedWithFileWatcherThread();
/*and*/ secondBrjsProcess = createNonTestModel();
given(brjs.sdkTemplateGroup("default")).templateGroupCreated()
.and(brjs.sdkTemplateGroup("default").template("app")).containsFile("index.html")
.and(brjs.applicationServer(appServerPort)).started();
when(secondBrjsProcess).runCommand("create-app", "app1", "blah");
then(brjs.applicationServer(appServerPort)).requestCanEventuallyBeMadeFor("/app1/");
}

@Test
public void newAppsAreHostedOnAppserverAfterServerRestartWhenCreateAppCommandUsedFromADifferentModelInstance() throws Exception
{
Expand Down Expand Up @@ -278,7 +292,7 @@ public void fileWatcherThreadDoesntThrowAnExceptionWhenAFileExistsInAppsDir() th
{
given(brjs).hasBeenAuthenticallyCreatedWithFileWatcherThread()
.and(templates).templateGroupCreated()
.and(brjs).containsFile("apps/file.txt")
.and(brjs).containsFile("brjs-apps/file.txt")
.and(brjs.applicationServer(appServerPort)).started();
when(secondBrjsProcess).runCommand("create-app", "app1", "blah")
.and(app1Conf).localesUpdatedTo("en", "de");
Expand Down
2 changes: 1 addition & 1 deletion ...-tests/src/test-integration/java/org/bladerunnerjs/spec/brjs/appserver/ServedWarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public void jndiTokensCanBeReplacedInAStandaloneWebserverWithoutAMockNamingConte
warServer = new Server(appServerPort);
WebAppContext webapp = new WebAppContext();
webapp.setContextPath("/");
webapp.setWar(brjs.workingDir().file("app1.war").getAbsolutePath());
webapp.setWar(brjs.file("app1.war").getAbsolutePath());
warServer.setHandler(webapp);
new EnvEntry(warServer, "SOME.TOKEN", "some token replacement", false);

Expand Down
2 changes: 1 addition & 1 deletion brjs-core-tests/src/test/java/org/bladerunnerjs/memoization/MemoizedValueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void setUp() throws Exception {
loggerMessageStore = new LogMessageStore();
loggerMessageStore.storeLogsIfEnabled();
loggerMessageStore.enableStoringLogs();
brjs = BRJSTestModelFactory.createModel(sdkDir, new MockPluginLocator(), new TestLoggerFactory(loggerMessageStore), new MockAppVersionGenerator());
brjs = BRJSTestModelFactory.createModel(sdkDir, sdkDir, new MockPluginLocator(), new TestLoggerFactory(loggerMessageStore), new MockAppVersionGenerator());
}

@After
Expand Down
88 changes: 75 additions & 13 deletions brjs-core-tests/src/test/java/org/bladerunnerjs/spec/brjs/BRJSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@
import org.bladerunnerjs.api.TestPack;
import org.bladerunnerjs.api.model.exception.command.NoSuchCommandException;
import org.bladerunnerjs.api.spec.engine.SpecTest;
import static org.bladerunnerjs.api.BRJS.Messages.*;

import java.io.File;
import java.io.IOException;

import org.apache.commons.io.FileUtils;
import org.bladerunnerjs.model.NamedDirNode;
import org.bladerunnerjs.model.events.CommandExecutedEvent;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

Expand All @@ -15,14 +22,20 @@ public class BRJSTest extends SpecTest {
private NamedDirNode brjsTemplate;
private App app1;
private App app2;
private File secondaryTempFolder = null;

@Before
public void initTestObjects() throws Exception
{
given(brjs).hasBeenCreated();
brjsTemplate = brjs.sdkTemplateGroup("default").template("brjs");
app1 = brjs.app("app1");
app2 = brjs.app("app2");
brjsTemplate = brjs.sdkTemplateGroup("default").template("brjs");
app1 = brjs.app("app1");
app2 = brjs.app("app2");
}

@After
public void deleteCreatedBrjsAppsDirFromTemp() throws IOException {
if (secondaryTempFolder != null) FileUtils.deleteQuietly(secondaryTempFolder);
}

@Test
Expand Down Expand Up @@ -91,26 +104,26 @@ public void brjsFilesInTemplateDontOverwriteExistingFiles() throws Exception {
}

@Test
public void locateAncestorNodeWorksWhenTheModelHasntBeenPrimed() throws Exception {
given(brjs.file("apps/app1/blades/myBlade/src")).containsFile("Class.js");
public void locateAncestorNodeWorksWhenTheModelHasntBeenPopulated() throws Exception {
given(brjs.file("brjs-apps/app1/blades/myBlade/src")).containsFile("Class.js");
// we can't check the actual node or talk about any nodes since brjs.app('myApp') etc would cause the node to be discovered and we need to keep an empty node tree
then(brjs).ancestorNodeCanBeFound(brjs.file("apps/app1/blades/myBlade/src/Class.js"), App.class);
then(brjs).ancestorNodeCanBeFound(brjs.file("brjs-apps/app1/blades/myBlade/src/Class.js"), App.class);
}

@Test
public void locateAncestorNodeWorksWhenTheModelHasntBeenPrimedAndTheFileRepresentsTheNodeType() throws Exception {
given(brjs.file("apps/app1/blades/myBlade/src")).containsFile("Class.js");
then(brjs).ancestorNodeCanBeFound(brjs.file("apps/app1/blades/myBlade"), Blade.class);
public void locateAncestorNodeWorksWhenTheModelHasntBeenPopulatedAndTheFileRepresentsTheNodeType() throws Exception {
given(brjs.file("brjs-apps/app1/blades/myBlade/src")).containsFile("Class.js");
then(brjs).ancestorNodeCanBeFound(brjs.file("brjs-apps/app1/blades/myBlade"), Blade.class);
}

@Test // this is not a duplicate of the test above even though it may look like it, this test has been seen failing when the above was passing
public void locateAncestorNodeWorksWhenTheModelHasntBeenPrimedAndTheFileRepresentsATestPack() throws Exception {
given(brjs.file("apps/app1/blades/myBlade/test-unit")).containsFile("file.txt");
then(brjs).ancestorNodeCanBeFound(brjs.file("apps/app1/blades/myBlade/test-unit/file.txt"), TestPack.class);
public void locateAncestorNodeWorksWhenTheModelHasntBeenPopulatedAndTheFileRepresentsATestPack() throws Exception {
given(brjs.file("brjs-apps/app1/blades/myBlade/test-unit")).containsFile("file.txt");
then(brjs).ancestorNodeCanBeFound(brjs.file("brjs-apps/app1/blades/myBlade/test-unit/file.txt"), TestPack.class);
}

@Test // this is not a duplicate of the test above even though it may look like it, this test has been seen failing when the above was passing
public void locateAncestorNodeWorksWhenTheModelHasntBeenPrimedAndTheFileRepresentsAnSdkNode() throws Exception {
public void locateAncestorNodeWorksWhenTheModelHasntBeenPopulatedAndTheFileRepresentsAnSdkNode() throws Exception {
given(brjs.file("sdk/libs/javascript/br/test-unit")).containsFile("file.txt");
then(brjs).ancestorNodeCanBeFound(brjs.file("sdk/libs/javascript/br/test-unit/file.txt"), TestPack.class);
}
Expand All @@ -120,4 +133,53 @@ public void locateAncestorNodeWorksReturnsNullIfTheNodeOfTheRequiredTypeCannotBe
given(brjs).containsFile("apps/file.txt");
then(brjs).ancestorNodeCannotBeFound(brjs.file("apps/file.txt"), App.class);
}

@Test
public void appsFolderIsTheActiveAppsFolderItExists() throws Exception {
given(testSdkDirectory).containsFolder("apps")
.and(brjs).hasBeenCreatedWithWorkingDir(testSdkDirectory);
when(brjs.app("app1BrjsApps")).create();
then(brjs).hasDir("apps/app1BrjsApps");
}

@Test
public void appsFolderIsTheActiveAppsFolderItExistsAlongWithBrjsAppsFolder() throws Exception {
given(testSdkDirectory).containsFolder("apps")
.and(testSdkDirectory).containsFolder("brjs-apps")
.and(brjs).hasBeenCreatedWithWorkingDir(testSdkDirectory);
when(brjs.app("app1BrjsApps")).create();
then(brjs).hasDir("apps/app1BrjsApps");
}

@Test
public void brjsAppsFolderInTheWorkingDirIsUsed() throws Exception {
secondaryTempFolder = org.bladerunnerjs.utility.FileUtils.createTemporaryDirectory(BRJSTest.class);
given(secondaryTempFolder).containsFolder("brjs-apps")
.and(brjs).hasBeenCreatedWithWorkingDir(secondaryTempFolder);
when(brjs.app("app1BrjsApps")).create();
then(secondaryTempFolder).containsDir("brjs-apps/app1BrjsApps");
}

@Test
public void brjsAppsFolderInTheParentOfTheWorkingDirIsUsed() throws Exception {
secondaryTempFolder = org.bladerunnerjs.utility.FileUtils.createTemporaryDirectory(BRJSTest.class);
given(secondaryTempFolder).containsFolder("brjs-apps/dir1/dir2/dir3")
.and(brjs).hasBeenCreatedWithWorkingDir(new File(secondaryTempFolder, "brjs-apps/dir1/dir2/dir3"));
when(brjs.app("app1BrjsApps")).create();
then(secondaryTempFolder).containsDir("brjs-apps/app1BrjsApps");
}

@Test
public void warningMessageIsLoggedWhenBothAppsAndBrjsAppsFoldersExist() throws Exception {
given(logging).echoEnabled();
given(testSdkDirectory).containsFolder("apps")
.and(testSdkDirectory).containsFolder("brjs-apps")
.and(logging).enabled();
when(brjs).hasBeenCreated();
then(logging).warnMessageReceived(BOTH_APPS_AND_BRJS_APPS_EXIST,
"brjs-apps", testSdkDirectory.getAbsolutePath(), "brjs-apps", "apps", testSdkDirectory.getAbsolutePath()+"/apps", testSdkDirectory.getAbsolutePath()+"/brjs-apps")
.and(logging).infoMessageReceived(CREATING_PLUGINS_LOG_MSG)
.and(logging).infoMessageReceived(PERFORMING_NODE_DISCOVERY_LOG_MSG)
.and(logging).infoMessageReceived(MAKING_PLUGINS_AVAILABLE_VIA_MODEL_LOG_MSG);
}
}
8 changes: 4 additions & 4 deletions ...re-tests/src/test/java/org/bladerunnerjs/spec/bundling/testpack/TestPackBundlingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void testCodeCanUseRequires() throws Exception {
@Test
public void aspectTestsDirectoryCanStillBeUsed() throws Exception {
// we cant use the node instances before this point since the test nodes depend on the 'tests' directory being present when they are instantiated
given(brjs).containsFileWithContents("apps/app/default-aspect/tests/test-type/tech/tests/myTest.js", "require('appns/Class1');")
given(brjs).containsFileWithContents("brjs-apps/app/default-aspect/tests/test-type/tech/tests/myTest.js", "require('appns/Class1');")
.and( brjs.app("app").aspect("default") ).hasClass("appns/Class1");
when( brjs.app("app").aspect("default").testType("type").testTech("tech") ).requestReceivedInDev("js/dev/combined/bundle.js", response);
then(response).containsCommonJsClasses("Class1");
Expand All @@ -98,7 +98,7 @@ public void aspectTestsDirectoryCanStillBeUsed() throws Exception {
@Test
public void bladesetTestsDirectoryCanStillBeUsed() throws Exception {
// we cant use the node instances before this point since the test nodes depend on the 'tests' directory being present when they are instantiated
given(brjs).containsFileWithContents("apps/app/bs-bladeset/tests/test-type/tech/tests/myTest.js", "require('appns/bs/Class1');")
given(brjs).containsFileWithContents("brjs-apps/app/bs-bladeset/tests/test-type/tech/tests/myTest.js", "require('appns/bs/Class1');")
.and( brjs.app("app").bladeset("bs") ).hasClass("appns/bs/Class1");
when( brjs.app("app").bladeset("bs").testType("type").testTech("tech") ).requestReceivedInDev("js/dev/combined/bundle.js", response);
then(response).containsCommonJsClasses("appns/bs/Class1");
Expand All @@ -107,7 +107,7 @@ public void bladesetTestsDirectoryCanStillBeUsed() throws Exception {
@Test
public void bladeTestsDirectoryCanStillBeUsed() throws Exception {
// we cant use the node instances before this point since the test nodes depend on the 'tests' directory being present when they are instantiated
given(brjs).containsFileWithContents("apps/app/bs-bladeset/blades/b1/tests/test-type/tech/tests/myTest.js", "require('appns/bs/b1/Class1');")
given(brjs).containsFileWithContents("brjs-apps/app/bs-bladeset/blades/b1/tests/test-type/tech/tests/myTest.js", "require('appns/bs/b1/Class1');")
.and( brjs.app("app").bladeset("bs").blade("b1") ).hasClass("appns/bs/b1/Class1");
when( brjs.app("app").bladeset("bs").blade("b1").testType("type").testTech("tech") ).requestReceivedInDev("js/dev/combined/bundle.js", response);
then(response).containsCommonJsClasses("appns/bs/b1/Class1");
Expand All @@ -116,7 +116,7 @@ public void bladeTestsDirectoryCanStillBeUsed() throws Exception {
@Test
public void workbenchTestsDirectoryCanStillBeUsed() throws Exception {
// we cant use the node instances before this point since the test nodes depend on the 'tests' directory being present when they are instantiated
given( brjs ).containsFileWithContents("apps/app/bs-bladeset/blades/b1/workbench/tests/test-type/tech/tests/myTest.js", "require('appns/Class1');")
given( brjs ).containsFileWithContents("brjs-apps/app/bs-bladeset/blades/b1/workbench/tests/test-type/tech/tests/myTest.js", "require('appns/Class1');")
.and( brjs.app("app").bladeset("bs").blade("b1").workbench() ).hasClass("Class1");
when( brjs.app("app").bladeset("bs").blade("b1").workbench().testType("type").testTech("tech") ).requestReceivedInDev("js/dev/combined/bundle.js", response);
then(response).containsCommonJsClasses("appns/Class1");
Expand Down
26 changes: 13 additions & 13 deletions brjs-core-tests/src/test/java/org/bladerunnerjs/spec/command/BundleDepsCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public void exceptionIsThrownIfTheDirectoryDoesntExist() throws Exception {
@Test
public void exceptionIsThrownIfABundlableNodeCantBeLocated() throws Exception {
given(app).hasBeenCreated();
when(brjs).runCommand("bundle-deps", "../apps");
then(exceptions).verifyException(InvalidBundlableNodeException.class, "apps")
when(brjs).runCommand("bundle-deps", "../brjs-apps");
then(exceptions).verifyException(InvalidBundlableNodeException.class, "brjs-apps")
.whereTopLevelExceptionIs(CommandArgumentsException.class);
}

Expand All @@ -81,7 +81,7 @@ public void commandIsAutomaticallyLoaded() throws Exception
{
given(aspect).hasBeenCreated()
.and(brjs).hasBeenAuthenticallyCreated();
when(brjs).runCommand("bundle-deps", "../apps/app/default-aspect");
when(brjs).runCommand("bundle-deps", "../brjs-apps/app/default-aspect");
then(exceptions).verifyNoOutstandingExceptions();
}

Expand All @@ -90,9 +90,9 @@ public void dependenciesAreShownWhenAllArgumentsAreValid() throws Exception {
given(aspect).indexPageRequires("appns/Class1")
.and(aspect).hasClasses("appns/Class1", "appns/Class2")
.and(aspect).classRequires("appns/Class1", "./Class2");
when(brjs).runCommand("bundle-deps", "../apps/app/default-aspect");
when(brjs).runCommand("bundle-deps", "../brjs-apps/app/default-aspect");
then(logging).containsConsoleText(
"Bundle 'apps/app/default-aspect' dependencies found:",
"Bundle 'brjs-apps/app/default-aspect' dependencies found:",
" +--- 'default-aspect/index.html' (seed file)",
" | \\--- 'default-aspect/src/appns/Class1.js'",
" | | \\--- 'default-aspect/src/appns/Class2.js'");
Expand All @@ -103,9 +103,9 @@ public void bladeTestpendenciesCanBeShown() throws Exception {
given(bladeTests).containsFileWithContents("MyTest.js", "require('appns/bs/b1/Class1')")
.and(blade).hasClasses("appns/bs/b1/Class1", "appns/bs/b1/Class2")
.and(blade).classRequires("appns/bs/b1/Class1", "./Class2");
when(brjs).runCommand("bundle-deps", "../apps/app/bs-bladeset/blades/b1/test-unit/js-test-driver");
when(brjs).runCommand("bundle-deps", "../brjs-apps/app/bs-bladeset/blades/b1/test-unit/js-test-driver");
then(logging).containsConsoleText(
"Bundle 'apps/app/bs-bladeset/blades/b1/test-unit/js-test-driver' dependencies found:",
"Bundle 'brjs-apps/app/bs-bladeset/blades/b1/test-unit/js-test-driver' dependencies found:",
" +--- 'bs-bladeset/blades/b1/test-unit/js-test-driver/tests/MyTest.js' (seed file)",
" | \\--- 'bs-bladeset/blades/b1/src/appns/bs/b1/Class1.js' (static dep.)",
" | | \\--- 'bs-bladeset/blades/b1/src/appns/bs/b1/Class2.js' (static dep.)");
Expand All @@ -115,9 +115,9 @@ public void bladeTestpendenciesCanBeShown() throws Exception {
public void optionalPackageStructuresAreShownCorrectly() throws Exception {
given(aspect).indexPageRequires("appns/bs/b1/Class1")
.and(app.bladeset("bs").blade("b1")).hasClasses("Class1");
when(brjs).runCommand("bundle-deps", "../apps/app/default-aspect/");
when(brjs).runCommand("bundle-deps", "../brjs-apps/app/default-aspect/");
then(logging).containsConsoleText(
"Bundle 'apps/app/default-aspect' dependencies found:",
"Bundle 'brjs-apps/app/default-aspect' dependencies found:",
" +--- 'default-aspect/index.html' (seed file)",
" | \\--- 'bs-bladeset/blades/b1/src/Class1.js'");
}
Expand All @@ -126,9 +126,9 @@ public void optionalPackageStructuresAreShownCorrectly() throws Exception {
public void defaultBladesetsAreShownCorrectly() throws Exception {
given(aspect).indexPageRequires("appns/b1/Class1")
.and(bladeInDefaultBladeset).hasClasses("appns/b1/Class1");
when(brjs).runCommand("bundle-deps", "../apps/app/default-aspect/");
when(brjs).runCommand("bundle-deps", "../brjs-apps/app/default-aspect/");
then(logging).containsConsoleText(
"Bundle 'apps/app/default-aspect' dependencies found:",
"Bundle 'brjs-apps/app/default-aspect' dependencies found:",
" +--- 'default-aspect/index.html' (seed file)",
" | \\--- 'blades/b1/src/appns/b1/Class1.js'");
}
Expand All @@ -137,9 +137,9 @@ public void defaultBladesetsAreShownCorrectly() throws Exception {
public void defaultAspectsAreShownCorrectly() throws Exception {
given(defaultAspect).indexPageRequires("appns/Class1")
.and(defaultAspect).hasClasses("appns/Class1");
when(brjs).runCommand("bundle-deps", "../apps/app");
when(brjs).runCommand("bundle-deps", "../brjs-apps/app");
then(logging).containsConsoleText(
"Bundle 'apps/app' dependencies found:",
"Bundle 'brjs-apps/app' dependencies found:",
" +--- 'index.html' (seed file)",
" | \\--- 'src/appns/Class1.js'");
}
Expand Down
2 changes: 1 addition & 1 deletion brjs-core-tests/src/test/java/org/bladerunnerjs/spec/command/CopyThemeCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void existingDestinationThemeDirectoryThrowsWarningWithWarning() throws E
.and(blade11).containsFile("themes/red/style.css")
.and(blade11).containsFolder("themes/blue");
when(brjs).runCommand("copy-theme", "app", "red", "blue");
then(logging).warnMessageReceived(THEME_FOLDER_EXISTS, "apps/app/bladeset1-bladeset/blades/blade11/themes/blue");
then(logging).warnMessageReceived(THEME_FOLDER_EXISTS, "brjs-apps/app/bladeset1-bladeset/blades/blade11/themes/blue");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion brjs-core-tests/src/test/java/org/bladerunnerjs/spec/command/J2eeifyCommandPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void webInfIsPopulatedFromApplicationServerUtils() throws Exception {
@Test
public void messageIsPrintedOnSucces() throws Exception {
when(brjs).runCommand("j2eeify", "app");
then(logging).containsFormattedConsoleMessage(J2eeifyCommandPlugin.Messages.SUCCESSFULLY_J2EEIFIED_APP_MESSAGE, "app", "apps/app/WEB-INF");
then(logging).containsFormattedConsoleMessage(J2eeifyCommandPlugin.Messages.SUCCESSFULLY_J2EEIFIED_APP_MESSAGE, "app", "brjs-apps/app/WEB-INF");
}

@Test @Ignore // TODO: investigate why this only fails in Travis...
Expand Down
2 changes: 1 addition & 1 deletion brjs-core-tests/src/test/java/org/bladerunnerjs/spec/model/AspectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void exceptionIsThrownIfThereAreTwoDefaultAspects() throws Exception
.and(app).containsFile("index.html")
.and(app).containsFile("default-aspect/index.html");
when(app).aspectsListed();
then(exceptions).verifyException(DuplicateAssetContainerException.class, "default Aspect", "apps/app1", "apps/app1/default-aspect");
then(exceptions).verifyException(DuplicateAssetContainerException.class, "default Aspect", "brjs-apps/app1", "brjs-apps/app1/default-aspect");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion brjs-core-tests/src/test/java/org/bladerunnerjs/spec/model/BladesetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public void exceptionIsThrownIfThereAreTwoDefaultBladesets() throws Exception
.and(app).hasDir("default-bladeset/blades/myBlade")
.and(app).hasDir("blades/myBlade");
when(app).bladesetsListed();
then(exceptions).verifyException(DuplicateAssetContainerException.class, "default Bladeset", "apps/app", "apps/app/default-bladeset");
then(exceptions).verifyException(DuplicateAssetContainerException.class, "default Bladeset", "brjs-apps/app", "brjs-apps/app/default-bladeset");
}

}