blob: 496ed04123ea4a88f1950bd04f030baca3d4698f [file] [log] [blame]
--- Q7 testcase ---
Format-Version: 1.0
Q7-vendor: www.xored.com/q7
Contexts: _rr2EEFpSEeKcnaHGSt8OwA,_f3qEUVpSEeKcnaHGSt8OwA,_IuFcgFpZEeKcnaHGSt8OwA,__UtTgD-XEeK-yuKsz0Lang
Element-Name: MergeProject
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _zjy44G64EeKbTKOCBYPcow
Save-Time: 3/24/13 8:45 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
Content-Type: text/ecl
Entry-Name: .content
get-view "Model Explorer" | get-tree | select "TestProjectSecondCheckOut \\[trunk, Version 0\\]/League America/Player Jonas" | double-click
get-editor "Player Jonas" | get-editbox -after [get-label Name] | set-text Jonas2
get-view "Model Explorer" | get-tree | select "TestProjectSecondCheckOut \\[trunk, Version 0\\]" | get-menu Commit | click
get-window Commit | get-button OK | click
get-view "Model Explorer" | get-tree | select "TestProject \\[trunk, Version 0\\]/League America/Player Jonas" | double-click
get-editor "Player Jonas" | get-editbox -after [get-label Name] | set-text Jonas3
get-view "Model Explorer" | get-tree | select "TestProject \\[trunk, Version 0\\]" | get-menu Update | click
get-window Update | get-button OK | click
get-window "Merge Wizard" | get-label "Merge Conflicts" | get-property caption
| equals "Merge Conflicts" | verify-true
with [get-window "Merge Wizard"] {
get-button "Keep All My Changes" | click
get-window "Override changes of other users" | get-button OK | click
get-button Finish | click
}
get-editor "Player Jonas3" | get-editbox -after [get-label Name] | get-property text | equals Jonas3 | verify-true
get-view "Model Explorer" | get-tree | select "TestProjectSecondCheckOut \\[trunk, Version 1\\]" | get-menu Update | click
get-window "No need to update" | get-button OK | click
get-view "Model Explorer" | get-tree | select "TestProject \\[trunk, Version 1\\]" | get-menu Commit | click
get-window Commit | get-button OK | click
get-view "Model Explorer" | get-tree | select "TestProjectSecondCheckOut \\[trunk, Version 1\\]" | get-menu Update | click
get-window Update | get-button OK | click
get-view "Model Explorer" | get-tree | select "TestProjectSecondCheckOut \\[trunk, Version 2\\]/League America/Player Jonas3" | double-click
get-editor "Player Jonas3" | get-editbox -after [get-label Name] | get-property text | equals Jonas3 | verify-true
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--