Merge branch '2.3_branch' into master

This commit is contained in:
Dan Rice 2015-01-02 21:25:34 -05:00
commit 70191af76b
19 changed files with 3 additions and 450 deletions

View file

@ -1,20 +0,0 @@
Then /^I should see a message that you need a context to see scripts$/ do
step 'I should see "You do not have any context yet. The script will be available after you add your first context"'
end
Then /^I should see scripts$/ do
# check on a small snippet of the first applescript
step 'I should see "set returnValue to call xmlrpc"'
end
Then /^I should see a script "([^\"]*)" for "([^\"]*)"$/ do |script, context_name|
expect(page).to have_css("##{script}", :visible => true)
context = Context.where(:name => context_name).first
expect(page).to have_content("#{context.id} (* #{context_name} *)")
# make sure the text is found within the textarea
script_source = page.find(:xpath, "//textarea[@id='#{script}']").text
expect(script_source).to match(/#{context.id} \(\* #{context_name} \*\)/)
end