rebase to master to include i18n changes and fix merge conflicts

This commit is contained in:
Reinier Balt 2011-01-19 10:13:56 +01:00
parent 7a74025253
commit 97e8602ef9
13 changed files with 43 additions and 34 deletions

View file

@ -1,9 +1,9 @@
Then /^I should see a message that you need a context to get feeds for contexts$/ do
Then "I should see \"There need to be at least one context before you can request a feed\""
Then "I should see \"There needs to be at least one context before you can request a feed\""
end
Then /^I should see a message that you need a project to get feeds for projects$/ do
Then "I should see \"There need to be at least one project before you can request a feed\""
Then "I should see \"There needs to be at least one project before you can request a feed\""
end
Then /^I should see feeds for projects$/ do
@ -29,3 +29,9 @@ Then /^I should see "([^"]*)" as the selected context$/ do |context_name|
scope.should have_selector("option[selected=\"selected\"]", :content => context_name)
end
end
Then /^I should see feeds for "([^"]*)" in list of "([^"]*)"$/ do |name, list_type|
selenium.wait_for :wait_for => :ajax, :javascript_framework => :jquery
xpath= "//div[@id='feeds-for-#{list_type}']//strong"
name.should == response.selenium.get_text("xpath=#{xpath}")
end