Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2013-06-17 22:40:49 +02:00
commit b897f8a0e1
2 changed files with 173 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/maintenance.js.coffee
View file

@ -4,6 +4,8 @@ class App.Maintenance extends App.ControllerContent
constructor: -> constructor: ->
super super
# check authentication
return if !@authenticate()
@render() @render()
render: -> render: ->

171
test/browser/maintenance_message_test.rb Normal file
View file

@ -0,0 +1,171 @@
# encoding: utf-8
require 'browser_test_helper'
class MaintenanceMessageTest < TestCase
def test_websocket
message = 'message 1äöüß ' + rand(99999999999999999).to_s
tests = [
{
:name => 'start',
:instance1 => browser_instance,
:instance2 => browser_instance,
:instance1_username => 'master@example.com',
:instance1_password => 'test',
:instance2_username => 'agent1@example.com',
:instance2_password => 'test',
:url => browser_url,
:action => [
{
:where => :instance1,
:execute => 'check',
:css => '#login',
:result => false,
},
{
:where => :instance2,
:execute => 'check',
:css => '#login',
:result => false,
},
{
:execute => 'wait',
:value => 1,
},
{
:where => :instance1,
:execute => 'click',
:css => 'a[href="#admin"]',
},
{
:execute => 'wait',
:value => 1,
},
{
:where => :instance1,
:execute => 'click',
:css => 'a[href="#maintenance"]',
},
{
:execute => 'wait',
:value => 1,
},
{
:where => :instance1,
:execute => 'set',
:css => 'input[name="title"]',
:value => message,
},
{
:where => :instance1,
:execute => 'set',
:css => 'textarea[name="message"]',
:value => message,
},
{
:where => :instance1,
:execute => 'click',
:css => 'button[type="submit"]',
},
{
:execute => 'wait',
:value => 5,
},
{
:where => :instance2,
:execute => 'check',
:css => '.modal-header',
:result => true,
},
{
:where => :instance2,
:execute => 'match',
:css => 'body',
:value => message,
:match_result => true,
},
{
:where => :instance2,
:execute => 'click',
:css => 'div.modal-backdrop.fade.in',
},
],
},
{
:name => 'start',
:instance1 => browser_instance,
:instance2 => browser_instance,
:instance1_username => 'master@example.com',
:instance1_password => 'test',
:instance2_username => 'agent1@example.com',
:instance2_password => 'test',
:url => browser_url,
:action => [
{
:where => :instance1,
:execute => 'check',
:css => '#login',
:result => false,
},
{
:where => :instance2,
:execute => 'check',
:css => '#login',
:result => false,
},
{
:execute => 'wait',
:value => 1,
},
{
:where => :instance1,
:execute => 'click',
:css => 'a[href="#admin"]',
},
{
:execute => 'wait',
:value => 1,
},
{
:where => :instance1,
:execute => 'click',
:css => 'a[href="#maintenance"]',
},
{
:execute => 'wait',
:value => 1,
},
{
:where => :instance1,
:execute => 'set',
:css => 'input[name="title"]',
:value => message,
},
{
:where => :instance1,
:execute => 'set',
:css => 'textarea[name="message"]',
:value => message,
},
{
:execute => 'wait',
:value => 5,
},
{
:where => :instance2,
:execute => 'check',
:css => 'div.modal-backdrop.fade.in',
:result => false,
},
{
:where => :instance2,
:execute => 'match',
:css => 'body',
:value => message,
:match_result => false,
},
],
},
]
browser_double_test(tests)
end
end