changed specification class to scenario

copypastedeveloper · Feb 15, 2013 · bb81970 · bb81970
1 parent 9965741
commit bb81970
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,9 +2,6 @@
 [Bb]in/
 [Oo]bj/
 
-# mstest test results
-TestResults
-
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 

diff --git a/Given.Common/StoryAttribute.cs b/Given.Common/StoryAttribute.cs
@@ -27,6 +27,6 @@ public string SoThat
             set { _soThat = value; }
         }
 
-        public bool IsValid { get { return !string.IsNullOrEmpty(_asA); } }
+        public bool IsValid { get { return !string.IsNullOrEmpty(_asA) && !string.IsNullOrEmpty(_want); } }
     }
 }
diff --git a/Given.Common/TestRun.cs b/Given.Common/TestRun.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 
 namespace Given.Common
 {
@@ -16,7 +15,7 @@ public TestRun()
 
         public void AddTest(TestStateManager testStateManager, Type type)
         {
-            var story = new Story((StoryAttribute)type.GetCustomAttributes(typeof (StoryAttribute), true).FirstOrDefault() ?? new StoryAttribute()) ;
+            var story = new Story((StoryAttribute)type.GetCustomAttributes(typeof(StoryAttribute), true).FirstOrDefault() ?? new StoryAttribute());
 
             if (!_stories.Any(x => x.Equals(story)))
                 _stories.Add(story);

diff --git a/Given.NUnit.Example/when_building_a_ford.cs b/Given.NUnit.Example/when_building_a_ford.cs
@@ -6,7 +6,7 @@ namespace Given.NUnit.Example
     [Story(AsA = "car manufacturer",
         IWant = "a factory that makes the right cars",
         SoThat = "I can make money")]
-    public class when_building_a_ford : Specification
+    public class when_building_a_ford : Scenario
     {
         static CarFactory _factory;
         static Car _car;

diff --git a/Given.NUnit.Example/when_building_a_toyota.cs b/Given.NUnit.Example/when_building_a_toyota.cs
@@ -6,7 +6,7 @@ namespace Given.NUnit.Example
     [Story(AsA = "car manufacturer",
            IWant = "a factory that makes the right cars",
            SoThat = "I can make money")]
-    public class when_building_a_toyota : Specification
+    public class when_building_a_toyota : Scenario
     {
         static CarFactory _factory;
         static Car _car;

diff --git a/Given.NUnit/Given.NUnit.csproj b/Given.NUnit/Given.NUnit.csproj
@@ -58,7 +58,7 @@
     <Compile Include="AssemblyFixtureAttribute.cs" />
     <Compile Include="scenarioAttribute.cs" />
     <Compile Include="thenAttribute.cs" />
-    <Compile Include="Specification.cs" />
+    <Compile Include="Scenario.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Given.NUnit/Specification.cs → Given.NUnit/Scenario.cs b/Given.NUnit/Specification.cs → Given.NUnit/Scenario.cs
@@ -6,7 +6,7 @@
 namespace Given.NUnit
 {
     [TestFixture]
-    public abstract class Specification
+    public abstract class Scenario
     {
         TestStateManager _testStateManager;