Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master' into nuget
Browse files Browse the repository at this point in the history
  • Loading branch information
elv1s42 committed Feb 27, 2017
2 parents 915b320 + 9195e30 commit ece33d6
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
12 changes: 7 additions & 5 deletions Ghpr.NUnit/Ghpr.Core.Settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"outputPath": "C:\\_GHPReportOutput",
"sprint": "",
"runName": "",
"runGuid": "",
"realTimeGeneration": "True"
"outputPath":"C:\\_GHPReporter_Core_Report",
"sprint":"",
"runName":"",
"runGuid":"",
"realTimeGeneration": "True",
"runsToDisplay": "5",
"testsToDisplay": "5"
}
4 changes: 3 additions & 1 deletion Ghpr.NUnit/Ghpr.NUnit.Settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"sprint": "",
"runName": "",
"runGuid": "",
"realTimeGeneration": "True"
"realTimeGeneration": "True",
"runsToDisplay": "5",
"testsToDisplay": "5"
}
8 changes: 4 additions & 4 deletions Ghpr.NUnit/Ghpr.NUnit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ghpr.Core, Version=0.4.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Ghpr.Core.0.4.4\lib\net452\Ghpr.Core.dll</HintPath>
<Reference Include="Ghpr.Core, Version=0.4.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Ghpr.Core.0.4.5\lib\net452\Ghpr.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
Expand All @@ -59,8 +59,8 @@
<HintPath>packages\NUnit.Engine.3.6.0\lib\nunit.engine.api.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions Ghpr.NUnit/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.4.4.0")]
[assembly: AssemblyFileVersion("0.4.4.0")]
[assembly: AssemblyVersion("0.4.5.0")]
[assembly: AssemblyFileVersion("0.4.5.0")]
2 changes: 1 addition & 1 deletion Ghpr.NUnit/Utils/ScreenHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static void SaveScreenshot(byte[] screenBytes)
var guid = TestContext.CurrentContext.Test.Properties.Get("TestGuid")?.ToString();
var fullName = TestContext.CurrentContext.Test.FullName;
var testGuid = guid != null ? Guid.Parse(guid) : GuidConverter.ToMd5HashGuid(fullName);
var fullPath = Path.Combine(GhprEventListener.OutputPath, Names.TestsFolderName, testGuid.ToString(), Names.ImgFolderName);
var fullPath = Path.Combine(GhprEventListener.OutputPath, Paths.Folders.Tests, testGuid.ToString(), Paths.Folders.Img);
var screenshotName = ScreenshotHelper.SaveScreenshot(fullPath, screenBytes, DateTime.Now);
var count = 0;
var screenKey = GetScreenKey(count);
Expand Down
4 changes: 2 additions & 2 deletions Ghpr.NUnit/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Ghpr.Core" version="0.4.4" targetFramework="net452" />
<package id="Ghpr.Core" version="0.4.5" targetFramework="net452" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
<package id="NUnit" version="3.6.0" targetFramework="net452" />
<package id="NUnit" version="3.6.1" targetFramework="net452" />
<package id="NUnit.Engine" version="3.6.0" targetFramework="net452" />
</packages>
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,7 @@ You can view [Demo report](http://ghpreporter.github.io/report/) on our [site](h

## View report locally

####Firefox

- Go to `about:config`
- Find `security.fileuri.strict_origin_policy` parameter
- Set it to `false`
Please read [Core instructions](https://github.com/GHPReporter/Ghpr.Core#view-report-locally)

## Contributing

Expand Down

0 comments on commit ece33d6

Please sign in to comment.