diff --git a/Concordion.NUnit/Concordion.NUnit.csproj b/Concordion.NUnit/Concordion.NUnit.csproj index 203cbc2..35b7060 100644 --- a/Concordion.NUnit/Concordion.NUnit.csproj +++ b/Concordion.NUnit/Concordion.NUnit.csproj @@ -32,14 +32,14 @@ - ..\tools\NUnit-2.6.3\nunit.core.dll + ..\tools\NUnit-2.6.4\nunit.core.dll - ..\tools\NUnit-2.6.3\nunit.core.interfaces.dll + ..\tools\NUnit-2.6.4\nunit.core.interfaces.dll False - ..\tools\NUnit-2.6.3\nunit.framework.dll + ..\tools\NUnit-2.6.4\nunit.framework.dll diff --git a/Concordion.Runners/Concordion.Runners.csproj b/Concordion.Runners/Concordion.Runners.csproj index c14048f..585d9be 100644 --- a/Concordion.Runners/Concordion.Runners.csproj +++ b/Concordion.Runners/Concordion.Runners.csproj @@ -33,7 +33,7 @@ False - ..\tools\NUnit-2.6.3\nunit.framework.dll + ..\tools\NUnit-2.6.4\nunit.framework.dll diff --git a/Concordion.Spec/Concordion.Spec.csproj b/Concordion.Spec/Concordion.Spec.csproj index 24213ef..44c0b58 100644 --- a/Concordion.Spec/Concordion.Spec.csproj +++ b/Concordion.Spec/Concordion.Spec.csproj @@ -53,9 +53,9 @@ AllRules.ruleset - + False - ..\tools\NUnit-2.6.3\nunit.framework.dll + ..\tools\NUnit-2.6.4\nunit.framework.dll diff --git a/Concordion.Test/Concordion.Test.csproj b/Concordion.Test/Concordion.Test.csproj index 3c10bd7..cb122d4 100644 --- a/Concordion.Test/Concordion.Test.csproj +++ b/Concordion.Test/Concordion.Test.csproj @@ -57,9 +57,9 @@ False ..\tools\Moq\Moq.dll - + False - ..\tools\NUnit-2.6.3\nunit.framework.dll + ..\tools\NUnit-2.6.4\nunit.framework.dll diff --git a/Concordion/Concordion.csproj b/Concordion/Concordion.csproj index aa13235..74e14c6 100644 --- a/Concordion/Concordion.csproj +++ b/Concordion/Concordion.csproj @@ -62,7 +62,7 @@ False - ..\tools\NUnit-2.6.3\nunit.framework.dll + ..\tools\NUnit-2.6.4\nunit.framework.dll ..\tools\OGNL.NET\OGNL.dll diff --git a/doc/Concordion/Integration/ReSharper.html b/doc/Concordion/Integration/ReSharper.html index 6ae9370..8997a48 100644 --- a/doc/Concordion/Integration/ReSharper.html +++ b/doc/Concordion/Integration/ReSharper.html @@ -21,7 +21,7 @@

ReSharper

specified NUnit installation (ReSharper -> Options ... -> Tools -> Unit Testing -> NUnit), you have to copy Concordion.NUnit.dll into the used NUnit installation (<nunit-installation-path>\bin\addins\). -
  • Make sure you use NUnit version 2.6.3 in any setup.
    • +
  • Make sure you use NUnit version 2.6.4 in any setup.
  • Run your Concordion.NET acceptance tests with ReSharper
      diff --git a/doc/Concordion/Setup.html b/doc/Concordion/Setup.html index 4a73b72..07ba580 100644 --- a/doc/Concordion/Setup.html +++ b/doc/Concordion/Setup.html @@ -39,14 +39,14 @@

      Setup

      • Concordion.dll
      • OGNL.dll
        • -
      • nunit.framework.dll (version 2.6.3)
        • +
      • nunit.framework.dll (version 2.6.4)

      To be able to run the Concordion.NET tests with NUnit you need to make the Concordion-NUnit addin available to your installation of NUnit:

        -
      • copy Concordion.NUnit.dll to <nunit-2.6.3-installation-path>\bin\addins\
        • +
      • copy Concordion.NUnit.dll to <nunit-2.6.4-installation-path>\bin\addins\

      These dependencies are included in the distribution.

      The Basics

      diff --git a/doc/RunningTests.html b/doc/RunningTests.html index bf58d8e..2669699 100644 --- a/doc/RunningTests.html +++ b/doc/RunningTests.html @@ -32,7 +32,7 @@

      Run Concordion.NET Acceptance Tests with NUnit

      Concordion.NET integrates with one of the most popular automated testing frameworks. Concordion.NET provides an NUnit Addin that allows you to run acceptance tests with any NUnit environment that supports NUnit Addins - (NUnit version 2.6.3). + (NUnit version 2.6.4). We describe how to run Concordion.NET tests with

      • stand alone NUnit test @@ -65,7 +65,7 @@

        Prepare your Visual Studio project containing Concordion.NET tests

    1. Add the attribute [assembly: RequiredAddin("ConcordionNUnitAddin")] to the AssemblyInfo.cs of your project. This tells NUnit that the - Concordion-NUnit-Addin + Concordion-NUnit-Addin is required to run your Concordion.NET tests.
    2. Make sure that you use .NET framework 4.0 or higher as target framework version in your Spec project that contains your Concordion.NET fixture classes.
      3. @@ -82,14 +82,14 @@

      Prepare your Visual Studio project containing Concordion.NET tests

      containing your automated acceptance tests.

    Using the standalone NUnit test runner

    -

    +

    NUnit provides different runners, which can be used to run your Concordion.NET tests.

    Run Concordion.NET tests with the NUnit GUI runner

    1. Download Concordion.NET.
      2. -
    2. Download and install NUnit version 2.6.3.
      3. +
    3. Download and install NUnit version 2.6.4.
    4. Copy the Concordion.NUnit.dll from the tools directory of your Concordion.NET package into the addin directory of your NUnit installation @@ -98,7 +98,7 @@

      Run Concordion.NET tests with the NUnit GUI runner

    5. Load your tests with the NUnit GUI runner.
      Tip: You can open your Visual Studio solutions and/or projects in NUnit, when you activate the - + IDE Support Settings - Visual Studio.
    6. Select the Concordion.NET test you want to run in the tree view and press the Run button.
      7. @@ -112,7 +112,7 @@

      Run Concordion.NET tests with the NUnit GUI runner

      C:\Users\<your-windows-user>\AppData\Local\Temp).

      Run Concordion.NET tests with the console runner

      NUnit provides a - + command line client for test execution, which can be useful for the automation of test execution and integration into other systems (e.g. build systems). You can run your Concordion.NET tests with the @@ -120,14 +120,14 @@

      Run Concordion.NET tests with the console runner

      1. Download Concordion.NET.
        2. -
      2. Download and install NUnit version 2.6.3.
        3. +
      3. Download and install NUnit version 2.6.4.
      4. Copy the Concordion.NUnit.dll from the tools directory of your Concordion.NET package into the addin directory of your NUnit installation (<NUnit-installation-path>\bin\addins).
        Please, make sure to use the latest version of this DLL, when you update Concordion.NET.
      5. In the command line window, - run + run the nunit-console application and pass in the DLL containing your Concordion.NET specifications and tests.
      diff --git a/tools/NUnit-2.6.3/nunit.framework.dll b/tools/NUnit-2.6.3/nunit.framework.dll deleted file mode 100644 index 780727f..0000000 Binary files a/tools/NUnit-2.6.3/nunit.framework.dll and /dev/null differ diff --git a/tools/NUnit-2.6.3/nunit.core.dll b/tools/NUnit-2.6.4/nunit.core.dll similarity index 52% rename from tools/NUnit-2.6.3/nunit.core.dll rename to tools/NUnit-2.6.4/nunit.core.dll index b306fae..0156d2d 100644 Binary files a/tools/NUnit-2.6.3/nunit.core.dll and b/tools/NUnit-2.6.4/nunit.core.dll differ diff --git a/tools/NUnit-2.6.3/nunit.core.interfaces.dll b/tools/NUnit-2.6.4/nunit.core.interfaces.dll similarity index 98% rename from tools/NUnit-2.6.3/nunit.core.interfaces.dll rename to tools/NUnit-2.6.4/nunit.core.interfaces.dll index 4053b0d..32d9b1f 100644 Binary files a/tools/NUnit-2.6.3/nunit.core.interfaces.dll and b/tools/NUnit-2.6.4/nunit.core.interfaces.dll differ diff --git a/tools/NUnit-2.6.4/nunit.framework.dll b/tools/NUnit-2.6.4/nunit.framework.dll new file mode 100644 index 0000000..ed6550b Binary files /dev/null and b/tools/NUnit-2.6.4/nunit.framework.dll differ