Add ParserSpecs for redirects

fsprojects · Sep 17, 2015 · 6078c7d · 6078c7d
1 parent aca6d7a
commit 6078c7d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/Paket.Core/InstallProcess.fs b/src/Paket.Core/InstallProcess.fs
@@ -320,7 +320,7 @@ let InstallIntoProjects(options : InstallerOptions, dependenciesFile, lockFile :
                 | _ -> options.Redirects || g.Value.Options.Redirects
 
             isEnabled && (fst kv.Key) = g.Key)
-        |> Seq.map (fun kv -> kv.Value)        
+        |> Seq.map (fun kv -> kv.Value)
         |> applyBindingRedirects options.CreateNewBindingFiles root 
 
 /// Installs all packages from the lock file.

diff --git a/tests/Paket.Tests/DependenciesFile/ParserSpecs.fs b/tests/Paket.Tests/DependenciesFile/ParserSpecs.fs
@@ -752,7 +752,7 @@ nuget FsReveal
 
 group Build
 
-    nuget FAKE
+    nuget FAKE redirects: on
     nuget NUnit condition: legacy
 """
 
@@ -763,4 +763,6 @@ let ``should read config with reference condition``() =
     cfg.Groups.[Constants.MainDependencyGroup].Options.Settings.ReferenceCondition |> shouldEqual (Some "MAIN-GROUP")
 
     cfg.Groups.[GroupName "Build"].Packages.Head.Settings.ReferenceCondition |> shouldEqual None
+    cfg.Groups.[GroupName "Build"].Packages.Head.Settings.CreateBindingRedirects |> shouldEqual (Some true)
     cfg.Groups.[GroupName "Build"].Packages.Tail.Head.Settings.ReferenceCondition |> shouldEqual (Some "LEGACY")
+    cfg.Groups.[GroupName "Build"].Packages.Tail.Head.Settings.CreateBindingRedirects |> shouldEqual None
diff --git a/tests/Paket.Tests/Lockfile/ParserSpecs.fs b/tests/Paket.Tests/Lockfile/ParserSpecs.fs
@@ -492,7 +492,7 @@ CONDITION: LEGACY
 NUGET
   remote: "D:\code\temp with space"
   specs:
-    FAKE (4.0)
+    FAKE (4.0) - redirects: on
 """   
 
 [<Test>]
@@ -523,4 +523,5 @@ let ``should parse lock file with groups``() =
     lockFile2.Options.Settings.ReferenceCondition |> shouldEqual (Some "LEGACY")
 
     packages2.Head.Source |> shouldEqual (PackageSource.LocalNuget("D:\code\\temp with space"))  
-    packages2.[0].Name |> shouldEqual (PackageName "FAKE")
+    packages2.[0].Name |> shouldEqual (PackageName "FAKE")
+    packages2.[0].Settings.CreateBindingRedirects |> shouldEqual (Some true)
diff --git a/tests/Paket.Tests/ReferencesFile/ReferencesFileSpecs.fs b/tests/Paket.Tests/ReferencesFile/ReferencesFileSpecs.fs
@@ -352,4 +352,23 @@ let ``should parse reffiles with reference condition``() =
     mainGroup.NugetPackages.Head.Name |> shouldEqual (PackageName "Castle.Windsor")
     mainGroup.NugetPackages.Head.Settings.ReferenceCondition |> shouldEqual None
     mainGroup.NugetPackages.Tail.Head.Name |> shouldEqual (PackageName "Newtonsoft.Json")
-    mainGroup.NugetPackages.Tail.Head.Settings.ReferenceCondition |> shouldEqual (Some "LEGACY")
+    mainGroup.NugetPackages.Tail.Head.Settings.ReferenceCondition |> shouldEqual (Some "LEGACY")
+
+
+let refFileWithRedirects = """
+Castle.Windsor  
+Newtonsoft.Json redirects:on
+FSharp.Core redirects:off
+"""
+
+[<Test>]
+let ``should parse reffiles with redirects``() = 
+    let refFile = ReferencesFile.FromLines(toLines refFileWithRedirects)
+    let mainGroup = refFile.Groups.[Constants.MainDependencyGroup]
+    mainGroup.NugetPackages.Length |> shouldEqual 3
+    mainGroup.NugetPackages.Head.Name |> shouldEqual (PackageName "Castle.Windsor")
+    mainGroup.NugetPackages.Head.Settings.CreateBindingRedirects |> shouldEqual None
+    mainGroup.NugetPackages.Tail.Head.Name |> shouldEqual (PackageName "Newtonsoft.Json")
+    mainGroup.NugetPackages.Tail.Head.Settings.CreateBindingRedirects |> shouldEqual (Some true)
+    mainGroup.NugetPackages.Tail.Tail.Head.Name |> shouldEqual (PackageName "FSharp.Core")
+    mainGroup.NugetPackages.Tail.Tail.Head.Settings.CreateBindingRedirects |> shouldEqual (Some false)