Spec refactoring
This commit is contained in:
@@ -57,30 +57,31 @@ with description('vncserver') as self:
|
|||||||
with after.each:
|
with after.each:
|
||||||
kill_xvnc()
|
kill_xvnc()
|
||||||
|
|
||||||
with it('asks user to select a DE on the first run'):
|
with context('on the first run'):
|
||||||
add_kasmvnc_user_docker()
|
with it('asks user to select a DE on the first run'):
|
||||||
|
add_kasmvnc_user_docker()
|
||||||
|
|
||||||
choose_cinnamon = "1\n"
|
choose_cinnamon = "1\n"
|
||||||
completed_process = run_cmd(vncserver_cmd, input=choose_cinnamon)
|
completed_process = run_cmd(vncserver_cmd, input=choose_cinnamon)
|
||||||
expect(completed_process.returncode).to(equal(0))
|
expect(completed_process.returncode).to(equal(0))
|
||||||
|
|
||||||
check_de_was_setup_to_run('cinnamon')
|
check_de_was_setup_to_run('cinnamon')
|
||||||
|
|
||||||
with it('selects passed DE with -s'):
|
with it('asks to select a DE, when ran with -select-de'):
|
||||||
add_kasmvnc_user_docker()
|
add_kasmvnc_user_docker()
|
||||||
|
|
||||||
cmd = f'{vncserver_cmd} -select-de mate'
|
cmd = f'{vncserver_cmd} -select-de'
|
||||||
completed_process = run_cmd(cmd)
|
choose_cinnamon_and_answer_yes = "1\ny\n"
|
||||||
expect(completed_process.returncode).to(equal(0))
|
completed_process = run_cmd(cmd, input=choose_cinnamon_and_answer_yes)
|
||||||
|
expect(completed_process.returncode).to(equal(0))
|
||||||
|
|
||||||
check_de_was_setup_to_run('mate')
|
check_de_was_setup_to_run('cinnamon')
|
||||||
|
|
||||||
with it('asks to select a DE, when ran with -select-de'):
|
with it('selects passed DE with -s'):
|
||||||
add_kasmvnc_user_docker()
|
add_kasmvnc_user_docker()
|
||||||
|
|
||||||
cmd = f'{vncserver_cmd} -select-de'
|
cmd = f'{vncserver_cmd} -select-de mate'
|
||||||
choose_cinnamon_and_answer_yes = "1\ny\n"
|
completed_process = run_cmd(cmd)
|
||||||
completed_process = run_cmd(cmd, input=choose_cinnamon_and_answer_yes)
|
expect(completed_process.returncode).to(equal(0))
|
||||||
expect(completed_process.returncode).to(equal(0))
|
|
||||||
|
|
||||||
check_de_was_setup_to_run('cinnamon')
|
check_de_was_setup_to_run('mate')
|
||||||
|
|||||||
Reference in New Issue
Block a user