Remove view spec and replace it with improved Cucumber feature. [#54]

marnen · Aug 6, 2013 · 74501f2 · 74501f2
1 parent a46ab79
commit 74501f2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 28 deletions.
diff --git a/features/commitments/update_commitment_status.feature b/features/commitments/update_commitment_status.feature
@@ -2,14 +2,15 @@ Feature: Update commitment status
   In order to share commitment status with other users
   any registered user should be able to
   change his commitment status to any event on any subscribed calendar.
-  
+
   Scenario: Start out as uncommitted
     Given I am logged in
     And I am subscribed to "Calendar 1"
     And someone else has an event called "Event" in "Calendar 1"
     And I am on the event list
     Then I should see "You are currently uncommitted."
-
+
+  @javascript
   Scenario Outline: Change commitment status
     Given I am logged in
     And I am subscribed to "Calendar 1"
@@ -18,8 +19,9 @@ Feature: Update commitment status
     When I select "<status>" from "status"
     And I press "Change status"
     Then I should see "You are currently <status>."
-    
+
     Examples:
       | status        |
       | attending     |
-      | not attending |
+      | not attending |
+      | uncommitted   |
diff --git a/features/step_definitions/calendar_steps.rb b/features/step_definitions/calendar_steps.rb
@@ -2,7 +2,7 @@
 
 Given /^(I|"[^\"]*") (?:am|is) subscribed to "([^\"]*)"$/ do |user, calendar|
   if user == 'I'
-    user = User.current_user
+    user = User.current_user || model!(:user)
   else
     names = user.gsub(/^"|"$/, '').split(' ', 2)
     user = FactoryGirl.create :user, :firstname => names.first, :lastname => names.last

diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
@@ -15,7 +15,7 @@
 end
 
 Given /^I am logged in$/ do
-  user = FactoryGirl.create :user, :password => 'passw0rd'
+  user = create_model :user, :password => 'passw0rd'
   login_as user
 end
 

diff --git a/features/support/capybara-webkit.rb b/features/support/capybara-webkit.rb
@@ -1 +1,3 @@
+require 'capybara/webkit'
+
 Capybara.javascript_driver = :webkit
diff --git a/spec/views/events/_attendance.html.haml_spec.rb b/spec/views/events/_attendance.html.haml_spec.rb