Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KSP-CKAN/CKAN
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ee19245ed467
Choose a base ref
...
head repository: KSP-CKAN/CKAN
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7d2fb8e93739
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 27, 2018

  1. Test upgrading mod with conflict on its own provides

    @HebaruSan
    HebaruSan committed Apr 27, 2018
    Copy the full SHA
    b381906 View commit details

Commits on Apr 28, 2018

  1. Merge #2431 Test upgrading mod with conflict on its own provides

    @politas
    politas committed Apr 28, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    politas Myk
    GPG key ID: 47938AAEAD85818F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7d2fb8e View commit details
Showing with 33 additions and 0 deletions.
  1. +3 −0 CHANGELOG.md
  2. +30 −0 Tests/Core/Relationships/SanityChecker.cs
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,9 @@ All notable changes to this project will be documented in this file.
### Bugfixes
- [core] Ignore conflicts between versions of same mod (#2430 by: HebaruSan; reviewed: politas)

### Internal
- [Core] Test upgrading mod with conflict on its own provides (#2431 by: HebaruSan; reviewed: politas)

## v1.25.1

### Features
30 changes: 30 additions & 0 deletions Tests/Core/Relationships/SanityChecker.cs
View file
Original file line number Diff line number Diff line change
@@ -296,6 +296,36 @@ public void IsConsistent_MultipleVersionsOfSelfConflictingModule_Consistent()
Assert.IsTrue(CKAN.SanityChecker.IsConsistent(modules));
}

[Test]
public void IsConsistent_MultipleVersionsOfSelfProvidesConflictingModule_Consistent()
{
// Arrange
List<CkanModule> modules = new List<CkanModule>()
{
CkanModule.FromJson(@"{
""identifier"": ""provides-conflictor"",
""version"": ""1.0.0"",
""download"": ""https://kerbalstuff.com/mod/269/Dogecoin%20Flag/download/1.01"",
""provides"": [ ""providee"" ],
""conflicts"": [ {
""name"": ""providee""
} ]
}"),
CkanModule.FromJson(@"{
""identifier"": ""provides-conflictor"",
""version"": ""1.2.3"",
""download"": ""https://kerbalstuff.com/mod/269/Dogecoin%20Flag/download/1.01"",
""provides"": [ ""providee"" ],
""conflicts"": [ {
""name"": ""providee""
} ]
}")
};

// Act & Assert
Assert.IsTrue(CKAN.SanityChecker.IsConsistent(modules));
}

private static void TestDepends(
List<string> to_remove,
List<CkanModule> mods,