GitHub-Mirror/huginn
2
0
Fork 0
mirror of https://github.com/Fishwaldo/huginn.git synced 2025-03-15 19:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:cantino/huginn

Browse source
This commit is contained in:
Dean Putney 2014-09-28 18:25:57 -07:00
commit 6073fb2a92
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
deployment/site-cookbooks/huginn_production/files/default/env.example
View file

@ -72,8 +72,8 @@ AGENT_LOG_LENGTH=200
#############################
# AWS Credentials for MTurk
AWS_ACCESS_KEY_ID="your aws access key id"
AWS_ACCESS_KEY="your aws access key"
AWS_ACCESS_KEY_ID=YOUR-AWS-ACCESS-KEY-ID
AWS_ACCESS_KEY=YOUR-AWS-ACCESS-KEY
# Set AWS_SANDBOX to true if you're developing Huginn code.
AWS_SANDBOX=false

14
spec/controllers/agents_controller_spec.rb
View file

@ -292,5 +292,19 @@ describe AgentsController do
delete :destroy, :id => agents(:jane_website_agent).to_param
}.should raise_error(ActiveRecord::RecordNotFound)
end
it "redirects correctly when the Agent is deleted from the Agent itself" do
sign_in users(:bob)
delete :destroy, :id => agents(:bob_website_agent).to_param
response.should redirect_to agents_path
end
it "redirects correctly when the Agent is deleted from a Scenario" do
sign_in users(:bob)
delete :destroy, :id => agents(:bob_weather_agent).to_param, :return => scenario_path(scenarios(:bob_weather)).to_param
response.should redirect_to scenario_path(scenarios(:bob_weather))
end
end
end