From 2ceaba7c79c6eb1dd7cca33770174f0e8d4c4038 Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Thu, 21 Mar 2013 03:03:55 +0000
Subject: [PATCH] Fixed test: features/edit_article.feature

---
 features/edit_article.feature               |  6 +++---
 features/language_redirection.feature       |  2 +-
 features/step_definitions/noosfero_steps.rb | 36 ++++++++++++++++++------------------
 features/support/env.rb                     |  1 +
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/features/edit_article.feature b/features/edit_article.feature
index 39f04d6..b215e99 100644
--- a/features/edit_article.feature
+++ b/features/edit_article.feature
@@ -94,7 +94,7 @@ Feature: edit article
     And I follow "Cancel"
     Then I should be on /joaosilva/save-the-whales
 
-  @selenium-fixme
+  @selenium
   Scenario: create an article inside a folder
     Given I am on joaosilva's control panel
     When I follow "Manage Content"
@@ -110,7 +110,7 @@ Feature: edit article
     Then I should see "My Article"
     And I should be on /joaosilva/my-folder/my-article
 
-  @selenium-fixme
+  @selenium
   Scenario: cancel button back to folder after giving up creating
     Given I am on joaosilva's control panel
     When I follow "Manage Content"
@@ -160,7 +160,7 @@ Feature: edit article
     Then I should be on /joaosilva/mi-neuvo-articulo
     And I should see "Translations"
 
-  @selenium-fixme
+  @selenium
   Scenario: not add a translation without a language
     Given the following articles
       | owner     | name               | language |
diff --git a/features/language_redirection.feature b/features/language_redirection.feature
index ab37ebb..c956e8a 100644
--- a/features/language_redirection.feature
+++ b/features/language_redirection.feature
@@ -7,7 +7,7 @@ Feature: language redirection
       | login  | name         |
       | manuel | Manuel Silva |
     And the following articles
-      | owner  | name       | body            | lang | translation_of |
+      | owner  | name       | body            | language | translation_of |
       | manuel | Meu Artigo | isso é um teste | pt   | nil            |
       | manuel | My Article | this is a test  | en   | Meu Artigo     |
 
diff --git a/features/step_definitions/noosfero_steps.rb b/features/step_definitions/noosfero_steps.rb
index 3afa890..42043df 100644
--- a/features/step_definitions/noosfero_steps.rb
+++ b/features/step_definitions/noosfero_steps.rb
@@ -114,7 +114,7 @@ Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded f
     parent = item.delete("parent")
     owner = Profile[owner_identifier]
     home = item.delete("homepage")
-    language = item.delete("lang")
+    language = item.delete("language")
     category = item.delete("category")
     filename = item.delete("filename")
     translation_of_id = nil
@@ -129,24 +129,24 @@ Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded f
       :profile => owner,
       :language => language,
       :translation_of_id => translation_of_id)
-      if !filename.blank?
-        item.merge!(:uploaded_data => fixture_file_upload("/files/#{filename}", 'binary/octet-stream'))
-      end
-      result = klass.new(item)
-      if !parent.blank?
-        result.parent = Article.find_by_name(parent)
-      end
-      if category
-        cat = Category.find_by_slug category
-        if cat
-          result.add_category(cat)
-        end
-      end
-      result.save!
-      if home == 'true'
-        owner.home_page = result
-        owner.save!
+    if !filename.blank?
+      item.merge!(:uploaded_data => fixture_file_upload("/files/#{filename}", 'binary/octet-stream'))
+    end
+    result = klass.new(item)
+    if !parent.blank?
+      result.parent = Article.find_by_name(parent)
+    end
+    if category
+      cat = Category.find_by_slug category
+      if cat
+        result.add_category(cat)
       end
+    end
+    result.save!
+    if home == 'true'
+      owner.home_page = result
+      owner.save!
+    end
   end
 end
 
diff --git a/features/support/env.rb b/features/support/env.rb
index 4d22ca6..a0fd5d4 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -24,6 +24,7 @@ require 'capybara/session'
 # prefer to use XPath just remove this line and adjust any selectors in your
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
+Capybara.ignore_hidden_elements = true
 
 # If you set this to false, any error raised from within your app will bubble
 # up to your step definition and out to cucumber unless you catch it somewhere
--
libgit2 0.21.2