Refactor to use version object #59

Enable writing safer version aware logic.
This commit is contained in:
undergroundwires
2022-02-26 17:15:30 +01:00
parent d6bc33ec86
commit eeb1d5b0c4
14 changed files with 198 additions and 35 deletions

View File

@@ -7,13 +7,14 @@ describe('ProjectInformationParser', () => {
describe('parseProjectInformation', () => {
it('parses expected repository version', () => {
// arrange
const expected = 'expected-version';
const expected = '0.11.3';
const env = getProcessEnvironmentStub();
env.VUE_APP_VERSION = expected;
// act
const info = parseProjectInformation(env);
// assert
expect(info.version).to.be.equal(expected);
const actual = info.version.toString();
expect(actual).to.be.equal(expected);
});
it('parses expected repository url', () => {
// arrange

View File

@@ -43,14 +43,14 @@ describe('CodeSubstituter', () => {
// arrange
const info = new ProjectInformationStub();
const date = new Date();
const testCases = [
const testCases: Array<{ parameter: string, argument: string }> = [
{
parameter: 'homepage',
argument: info.homepage,
},
{
parameter: 'version',
argument: info.version,
argument: info.version.toString(),
},
{
parameter: 'date',

View File

@@ -3,12 +3,13 @@ import { expect } from 'chai';
import { ProjectInformation } from '@/domain/ProjectInformation';
import { OperatingSystem } from '@/domain/OperatingSystem';
import { EnumRangeTestRunner } from '@tests/unit/application/Common/EnumRangeTestRunner';
import { VersionStub } from '@tests/unit/shared/Stubs/VersionStub';
describe('ProjectInformation', () => {
it('sets name as expected', () => {
// arrange
const expected = 'expected-name';
const sut = new ProjectInformation(expected, 'version', 'repositoryUrl', 'homepage');
const sut = new ProjectInformation(expected, new VersionStub('0.7.2'), 'repositoryUrl', 'homepage');
// act
const actual = sut.name;
// assert
@@ -16,17 +17,17 @@ describe('ProjectInformation', () => {
});
it('sets version as expected', () => {
// arrange
const expected = 'expected-version';
const expected = new VersionStub('0.11.3');
const sut = new ProjectInformation('name', expected, 'repositoryUrl', 'homepage');
// act
const actual = sut.version;
// assert
expect(actual).to.equal(expected);
expect(actual).to.deep.equal(expected);
});
it('sets repositoryUrl as expected', () => {
// arrange
const expected = 'expected-repository-url';
const sut = new ProjectInformation('name', 'version', expected, 'homepage');
const sut = new ProjectInformation('name', new VersionStub('0.7.2'), expected, 'homepage');
// act
const actual = sut.repositoryUrl;
// assert
@@ -36,7 +37,7 @@ describe('ProjectInformation', () => {
it('sets repositoryUrl when it does not end with .git', () => {
// arrange
const expected = 'expected-repository-url';
const sut = new ProjectInformation('name', 'version', expected, 'homepage');
const sut = new ProjectInformation('name', new VersionStub('0.7.2'), expected, 'homepage');
// act
const actual = sut.repositoryWebUrl;
// assert
@@ -45,7 +46,7 @@ describe('ProjectInformation', () => {
it('removes ".git" from the end when it ends with ".git"', () => {
// arrange
const expected = 'expected-repository-url';
const sut = new ProjectInformation('name', 'version', `${expected}.git`, 'homepage');
const sut = new ProjectInformation('name', new VersionStub('0.7.2'), `${expected}.git`, 'homepage');
// act
const actual = sut.repositoryWebUrl;
// assert
@@ -55,7 +56,7 @@ describe('ProjectInformation', () => {
it('sets homepage as expected', () => {
// arrange
const expected = 'expected-homepage';
const sut = new ProjectInformation('name', 'version', 'repositoryUrl', expected);
const sut = new ProjectInformation('name', new VersionStub('0.7.2'), 'repositoryUrl', expected);
// act
const actual = sut.homepage;
// assert
@@ -65,7 +66,7 @@ describe('ProjectInformation', () => {
// arrange
const repositoryUrl = 'https://github.com/undergroundwires/privacy.sexy.git';
const expected = 'https://github.com/undergroundwires/privacy.sexy/issues';
const sut = new ProjectInformation('name', 'version', repositoryUrl, 'homepage');
const sut = new ProjectInformation('name', new VersionStub('0.7.2'), repositoryUrl, 'homepage');
// act
const actual = sut.feedbackUrl;
// assert
@@ -74,7 +75,7 @@ describe('ProjectInformation', () => {
it('sets releaseUrl to github releases page', () => {
// arrange
const repositoryUrl = 'https://github.com/undergroundwires/privacy.sexy.git';
const version = '0.7.2';
const version = new VersionStub('0.7.2');
const expected = 'https://github.com/undergroundwires/privacy.sexy/releases/tag/0.7.2';
const sut = new ProjectInformation('name', version, repositoryUrl, 'homepage');
// act
@@ -87,7 +88,7 @@ describe('ProjectInformation', () => {
// arrange
const expected = 'https://github.com/undergroundwires/privacy.sexy/releases/download/0.7.2/privacy.sexy-0.7.2.dmg';
const repositoryUrl = 'https://github.com/undergroundwires/privacy.sexy.git';
const version = '0.7.2';
const version = new VersionStub('0.7.2');
const sut = new ProjectInformation('name', version, repositoryUrl, 'homepage');
// act
const actual = sut.getDownloadUrl(OperatingSystem.macOS);
@@ -98,7 +99,7 @@ describe('ProjectInformation', () => {
// arrange
const expected = 'https://github.com/undergroundwires/privacy.sexy/releases/download/0.7.2/privacy.sexy-0.7.2.AppImage';
const repositoryUrl = 'https://github.com/undergroundwires/privacy.sexy.git';
const version = '0.7.2';
const version = new VersionStub('0.7.2');
const sut = new ProjectInformation('name', version, repositoryUrl, 'homepage');
// act
const actual = sut.getDownloadUrl(OperatingSystem.Linux);
@@ -109,7 +110,7 @@ describe('ProjectInformation', () => {
// arrange
const expected = 'https://github.com/undergroundwires/privacy.sexy/releases/download/0.7.2/privacy.sexy-Setup-0.7.2.exe';
const repositoryUrl = 'https://github.com/undergroundwires/privacy.sexy.git';
const version = '0.7.2';
const version = new VersionStub('0.7.2');
const sut = new ProjectInformation('name', version, repositoryUrl, 'homepage');
// act
const actual = sut.getDownloadUrl(OperatingSystem.Windows);
@@ -118,7 +119,7 @@ describe('ProjectInformation', () => {
});
describe('throws when os is invalid', () => {
// arrange
const sut = new ProjectInformation('name', 'version', 'repositoryUrl', 'homepage');
const sut = new ProjectInformation('name', new VersionStub(), 'repositoryUrl', 'homepage');
// act
const act = (os: OperatingSystem) => sut.getDownloadUrl(os);
// assert

View File

@@ -0,0 +1,115 @@
import 'mocha';
import { expect } from 'chai';
import { Version } from '@/domain/Version';
describe('Version', () => {
describe('invalid versions', () => {
describe('throws with invalid semantic version', () => {
// arrange
const invalidVersions = [
'0.1.0.0', '0.1', '0.1..0', '0..1.0', '0..1', '...', '0.10', '0.-5.4',
];
for (const version of invalidVersions) {
const expectedError = `invalid version: ${version}`;
it(`given ${version}`, () => {
// act
const act = () => new Version(version);
//
expect(act).to.throw(expectedError);
});
}
});
describe('throws with empty string', () => {
// arrange
const expectedError = 'empty version';
const testCases = [
{ name: 'empty', value: '' },
{ name: 'undefined', value: undefined },
];
for (const testCase of testCases) {
it(`given ${testCase.name}`, () => {
// act
const act = () => new Version(testCase.value);
//
expect(act).to.throw(expectedError);
});
}
});
});
describe('valid versions', () => {
const validVersions: Array<ValidVersionTestData> = [
{
text: '0.1.0',
parts: { major: 0, minor: 1, patch: 0 },
},
{
text: '3.0.0',
parts: { major: 3, minor: 0, patch: 0 },
},
{
text: '100.1000.10000',
parts: { major: 100, minor: 1000, patch: 10000 },
},
];
function testValidVersions(tester: (data: ValidVersionTestData) => void) {
for (const version of validVersions) {
it(`given ${version.text}`, () => {
tester(version);
});
}
}
describe('major', () => {
testValidVersions((version) => {
// arrange
const expected = version.parts.major;
// act
const sut = new Version(version.text);
const actual = sut.major;
// assert
expect(expected).to.equal(actual);
});
});
describe('minor', () => {
testValidVersions((version) => {
// arrange
const expected = version.parts.minor;
// act
const sut = new Version(version.text);
const actual = sut.minor;
// assert
expect(expected).to.equal(actual);
});
});
describe('patch', () => {
testValidVersions((version) => {
// arrange
const expected = version.parts.patch;
// act
const sut = new Version(version.text);
const actual = sut.patch;
// assert
expect(expected).to.equal(actual);
});
});
describe('toString', () => {
testValidVersions((version) => {
// arrange
const expected = version.text;
// act
const sut = new Version(expected);
const actual = sut.toString();
// assert
expect(expected).to.equal(actual);
});
});
});
});
interface ValidVersionTestData {
text: string;
parts: {
major: number,
minor: number,
patch: number,
},
}

View File

@@ -1,6 +1,6 @@
export function getProcessEnvironmentStub(): NodeJS.ProcessEnv {
return {
VUE_APP_VERSION: 'stub-version',
VUE_APP_VERSION: '0.11.3',
VUE_APP_NAME: 'stub-name',
VUE_APP_REPOSITORY_URL: 'stub-repository-url',
VUE_APP_HOMEPAGE_URL: 'stub-homepage-url',

View File

@@ -1,9 +1,11 @@
import { IProjectInformation } from '@/domain/IProjectInformation';
import { Version } from '@/domain/Version';
import { VersionStub } from './VersionStub';
export class ProjectInformationStub implements IProjectInformation {
public name = 'name';
public version = 'version';
public version = new VersionStub();
public repositoryUrl = 'repositoryUrl';
@@ -22,7 +24,7 @@ export class ProjectInformationStub implements IProjectInformation {
return this;
}
public withVersion(version: string): ProjectInformationStub {
public withVersion(version: Version): ProjectInformationStub {
this.version = version;
return this;
}

View File

@@ -0,0 +1,7 @@
import { Version } from '@/domain/Version';
export class VersionStub extends Version {
constructor(version?: string) {
super(version ?? '0.10.0');
}
}