Skip to content

Commit

Permalink
Merge pull request #42 from shanec-/development
Browse files Browse the repository at this point in the history
RC 1.7.0
  • Loading branch information
shanec- committed Jun 17, 2018
2 parents 86eef33 + 4cfddf8 commit 2bf27d4
Show file tree
Hide file tree
Showing 41 changed files with 7,981 additions and 3,922 deletions.
18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Yeoman nullfactory-xrm",
"program": "${workspaceFolder}/node_modules/yo/lib/cli.js",
"args": ["nullfactory-xrm"],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"cwd": "${env:gen-nfx-debug}"
}
]
}
8 changes: 8 additions & 0 deletions __tests__/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ describe('generator-nullfactory-xrm:app', () => {
'Nullfactory.Xrm.Tooling/Scripts/Pull-CrmSolution.Param.ps1',
'Nullfactory.Xrm.Tooling/Scripts/Deploy-CrmSolution.ps1',
'Nullfactory.Xrm.Tooling/Scripts/Deploy-CrmSolution.Param.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Backup-CrmInstance.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Create-CrmInstance.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/CrmInstance.Common.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Delete-CrmInstance.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Get-AvailableCrmInstances.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Get-AvailableCrmTemplates.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Restore-CrmInstance.ps1',
'_RunFirst.ps1',
'TestSolution.sln',
'Test.FirstSolution/Test.FirstSolution.csproj',
'Test.FirstSolution.WebResources/Test.FirstSolution.WebResources.csproj',
Expand Down
65 changes: 65 additions & 0 deletions __tests__/tooling.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
'use strict';
const path = require('path');
const assert = require('yeoman-assert');
const helpers = require('yeoman-test');

describe('generator-nullfactory-xrm:tooling', () => {
beforeAll(() => {
return helpers.run(path.join(__dirname, '../generators/tooling')).withPrompts({
isToolingUpgrade: true
});
});

it('creates files', () => {
assert.file([
'Nullfactory.Xrm.Tooling/packages.config',
'Nullfactory.Xrm.Tooling/_Install/Install-Microsoft.Xrm.Data.PowerShell.ps1',
'Nullfactory.Xrm.Tooling/Scripts/ApplyVersionToArtifact.ps1',
'Nullfactory.Xrm.Tooling/Scripts/CrmSolution.Common.ps1',
'Nullfactory.Xrm.Tooling/Scripts/Pull-CrmSolution.ps1',
'Nullfactory.Xrm.Tooling/Scripts/Deploy-CrmSolution.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Backup-CrmInstance.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Create-CrmInstance.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/CrmInstance.Common.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Delete-CrmInstance.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Get-AvailableCrmInstances.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Get-AvailableCrmTemplates.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Restore-CrmInstance.ps1'
]);

assert.noFile([
'Nullfactory.Xrm.Tooling/Nullfactory.Xrm.Tooling.csproj',
'Nullfactory.Xrm.Tooling/Scripts/Pull-CrmSolution.Param.ps1',
'Nullfactory.Xrm.Tooling/Scripts/Deploy-CrmSolution.Param.ps1'
]);
});
});

describe('generator-nullfactory-xrm:tooling no upgrade', () => {
beforeAll(() => {
return helpers.run(path.join(__dirname, '../generators/tooling')).withPrompts({
isToolingUpgrade: false
});
});

it('creates no files', () => {
assert.noFile([
'Nullfactory.Xrm.Tooling/packages.config',
'Nullfactory.Xrm.Tooling/_Install/Install-Microsoft.Xrm.Data.PowerShell.ps1',
'Nullfactory.Xrm.Tooling/Scripts/ApplyVersionToArtifact.ps1',
'Nullfactory.Xrm.Tooling/Scripts/CrmSolution.Common.ps1',
'Nullfactory.Xrm.Tooling/Scripts/Pull-CrmSolution.ps1',
'Nullfactory.Xrm.Tooling/Scripts/Deploy-CrmSolution.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Backup-CrmInstance.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Create-CrmInstance.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/CrmInstance.Common.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Delete-CrmInstance.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Get-AvailableCrmInstances.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Get-AvailableCrmTemplates.ps1',
'Nullfactory.Xrm.Tooling/Scripts/omapi/Restore-CrmInstance.ps1',
'Nullfactory.Xrm.Tooling/Nullfactory.Xrm.Tooling.csproj',
'Nullfactory.Xrm.Tooling/Scripts/Pull-CrmSolution.Param.ps1',
'Nullfactory.Xrm.Tooling/Scripts/Deploy-CrmSolution.Param.ps1'
]);
});
});
Loading

0 comments on commit 2bf27d4

Please sign in to comment.