Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 lib/DependencyResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ export class DependencyResolver {
const edgeAttributes = graph.graph.getEdgeAttributes(edge)
this._store?.addRequirement(
new Requirement()
.withSource(RequirementSource.Dependency)
.withSource(edgeAttributes[Requirement.PROPERTY_SOURCE])
.withSourceModule(edgeAttributes[Requirement.PROPERTY_SOURCE_MODULE])
.withTargetModule(targetModule)
.withDependencyRange(edgeAttributes[Requirement.PROPERTY_DEPENDENCY_RANGE])
Expand Down
6 changes: 3 additions & 3 deletions lib/Requirement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ export class Requirement implements Attributes {
*/
public isValid(): boolean {
if (this.source === RequirementSource.Dependency && !this.sourceModule) {
throw `Requirement has no source module`
throw `Requirement has no source module. ${JSON.stringify(this)}`
}
if (!this.targetModule) {
throw `Requirement has no target module`
throw `Requirement has no target module. ${JSON.stringify(this)}`
}
if (!this.dependencyRange) {
throw `Requirement has no dependency range`
throw `Requirement has no dependency range. ${JSON.stringify(this)}`
}
return true
}
Expand Down
36 changes: 30 additions & 6 deletions test/dependency.resolver.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,20 @@ describe('The dependency resolver', function () {
],
},
})
sb.get('/v3/releases/test-defaultdependency-1.2.4').setResponseBody({
slug: 'test-defaultdependency',
metadata: {
dependencies: [],
},
})
sb.get('/v3/releases/test-defaultdependency-1.2.5').setResponseBody({
slug: 'test-defaultdependency',
metadata: {
dependencies: [],
},
})
sb.get('/v3/releases/test-wrongdepa-1.2.3').setResponseBody({
slug: 'test-defaultdependency',
slug: 'test-wrongdepa',
metadata: {
dependencies: [
{
Expand All @@ -56,7 +62,7 @@ describe('The dependency resolver', function () {
},
})
sb.get('/v3/releases/test-wrongdepb-1.2.3').setResponseBody({
slug: 'test-defaultdependency',
slug: 'test-wrongdepb',
metadata: {
dependencies: [
{
Expand All @@ -67,13 +73,13 @@ describe('The dependency resolver', function () {
},
})
sb.get('/v3/releases/test-wrongdepc-1.2.2').setResponseBody({
slug: 'test-defaultdependency',
slug: 'test-wrongdepc',
metadata: {
dependencies: [],
},
})
sb.get('/v3/releases/test-wrongdepc-1.2.3').setResponseBody({
slug: 'test-defaultdependency',
slug: 'test-wrongdepc',
metadata: {
dependencies: [],
},
Expand All @@ -95,6 +101,9 @@ describe('The dependency resolver', function () {
sb.get('/v3/modules/test-defaultdependency').setResponseBody({
slug: 'test-defaultdependency',
releases: [
{
version: '1.2.4',
},
{
version: '1.2.5',
},
Expand Down Expand Up @@ -191,7 +200,7 @@ mod 'test-dependency', '1.2.4'
expect(subject.modules[0].version).toEqual('1.2.3')
expect(subject.dependentModules).toHaveLength(1)
expect(subject.dependentModules[0].getSlug()).toEqual('test-defaultdependency')
expect(subject.dependentModules[0].version).toEqual('1.2.5')
expect(subject.dependentModules[0].version).toEqual('1.2.4')
})

it('should create a valid puppetfile when a dependency is in the Puppetfile', async () => {
Expand Down Expand Up @@ -231,7 +240,7 @@ mod 'test-dependency', '1.2.4'
expect(subject.modules).toHaveLength(0)
expect(subject.dependentModules).toHaveLength(1)
expect(subject.dependentModules[0].getSlug()).toEqual('test-defaultdependency')
expect(subject.dependentModules[0].version).toEqual('1.2.5')
expect(subject.dependentModules[0].version).toEqual('1.2.4')
})

it('should throw on invalid dependencies', async () => {
Expand Down Expand Up @@ -335,4 +344,19 @@ mod 'test-wrongdepc', '1.2.3'

await expect(subject.resolve()).resolves.toBeInstanceOf(PuppetFile)
})

it('should not throw when downgrading a module that has the Puppetfile as its source', async () => {
await expect(
new DependencyResolver()
.withPuppetFile(
await new PuppetFile().fromText(`
forge 'http://localhost:${sb.getPort()}'

mod 'test-default', '1.2.3'
mod 'test-defaultdependency', '1.2.5'
`)
)
.resolve()
).resolves.toBeInstanceOf(PuppetFile)
})
})
Loading