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

559 fix tasks #748

Merged
merged 2 commits into from
Nov 3, 2022
Merged

559 fix tasks #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a49c27
Fix tasks
mtgoncalves1 Nov 2, 2022
3d27316
Fix task tests
mtgoncalves1 Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/commands/task.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default class TaskExec extends BaseCommand {
throw new Error(`Error parsing component: ${err}`);
}

const project_name = await DockerComposeUtils.getProjectName(`arc-${parsed_slug.component_name}-task`);
const project_name = flags.environment || DockerComposeUtils.DEFAULT_PROJECT;
const compose_file = flags['compose-file'] || DockerComposeUtils.buildComposeFilepath(this.app.config.getConfigDir(), project_name);

let compose;
Expand Down
8 changes: 4 additions & 4 deletions test/commands/task.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ describe('task:exec', async function () {
expect(run.calledOnce).to.be.true;
expect(loadDockerCompose.calledOnce).to.be.true;

expect(ctx.stdout).to.contain(`Running task ${task_name} in the local ${mock_component.name} environment...`);
expect(ctx.stdout).to.contain(`Running task ${task_name} in the local ${DockerComposeUtils.DEFAULT_PROJECT} environment...`);
expect(ctx.stdout).to.contain('Successfully ran task.');
});

Expand All @@ -206,7 +206,7 @@ describe('task:exec', async function () {
const loadDockerCompose = DockerComposeUtils.loadDockerCompose as sinon.SinonStub;
const runDockerCompose = DockerComposeUtils.run as sinon.SinonStub;
expect(runDockerCompose.calledOnce).to.be.true;
expect(runDockerCompose.args[0]).to.deep.equal([mock_ref, mock_component.name, path.join('test', 'docker-compose', `${mock_component.name}.yml`)]);
expect(runDockerCompose.args[0]).to.deep.equal([mock_ref, 'architect', path.join('test', 'docker-compose', 'architect.yml')]);
expect(loadDockerCompose.calledOnce).to.be.true;
});

Expand Down Expand Up @@ -252,7 +252,7 @@ describe('task:exec', async function () {
.stderr({ print })
.command(['task:exec', '-l', namespaced_component_name, mock_task.name])
.catch(err => {
expect(err.message).to.contain(`Could not find docker compose file at ${DockerComposeUtils.buildComposeFilepath('test', mock_component.name)}. Please run \`architect dev -e ${mock_component.name} ${namespaced_component_name}\` before executing any tasks in your local ${mock_component.name} environment.`);
expect(err.message).to.contain(`Could not find docker compose file at ${DockerComposeUtils.buildComposeFilepath('test', DockerComposeUtils.DEFAULT_PROJECT)}. Please run \`architect dev -e ${DockerComposeUtils.DEFAULT_PROJECT} ${namespaced_component_name}\` before executing any tasks in your local ${DockerComposeUtils.DEFAULT_PROJECT} environment.`);
})
.it('fails with a useful message if no docker compose file is found');

Expand All @@ -276,7 +276,7 @@ describe('task:exec', async function () {
.stderr({ print })
.command(['task:exec', '-l', namespaced_component_name, mock_task.name])
.catch(err => {
expect(err.message).to.contain(`Could not find ${task_name} running in your local ${mock_component.name} environment`);
expect(err.message).to.contain(`Could not find ${task_name} running in your local ${DockerComposeUtils.DEFAULT_PROJECT} environment`);
})
.it('fails with a useful message if the specified task is not present in the docker compose');

Expand Down