diff options
| author | jessib <jessib@riseup.net> | 2013-12-17 12:02:07 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-12-17 12:02:07 -0800 |
| commit | 98a247acb4d1be484c2982d48ec038eed3de3d55 (patch) | |
| tree | f176092fa43145b9d8ce00a180fab70cf62da456 /help/test/functional | |
| parent | 634db9875cc8f6f6b9a4a83dfc6b8d53728eb2b5 (diff) | |
| parent | 83cd3d95b78b6df9ac33a8ee169e570f4d3e2eeb (diff) | |
Merge branch 'develop' into feature/billing-no-authenticated-payments
Conflicts:
billing/config/locales/en.yml
Diffstat (limited to 'help/test/functional')
| -rw-r--r-- | help/test/functional/tickets_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/help/test/functional/tickets_controller_test.rb b/help/test/functional/tickets_controller_test.rb index 3747ad0..0f56e6e 100644 --- a/help/test/functional/tickets_controller_test.rb +++ b/help/test/functional/tickets_controller_test.rb @@ -53,7 +53,7 @@ class TicketsControllerTest < ActionController::TestCase end test "should create unauthenticated ticket" do - params = {:title => "unauth ticket test title", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}} + params = {:subject => "unauth ticket test subject", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}} assert_difference('Ticket.count') do post :create, :ticket => params @@ -70,7 +70,7 @@ class TicketsControllerTest < ActionController::TestCase test "should create authenticated ticket" do - params = {:title => "auth ticket test title", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}} + params = {:subject => "auth ticket test subject", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}} login |