@@ -1,5 +1,5 @@ Given t(/^the dialog "([^\"]*)" is visible$/) do |name| - dialog(name) + container.set dialog(name) end Given t(/^the dialog "([^\"]*)" is the container$/) do |name| lib/swinger/step_definitions/dialog_steps.rb @@ -1,5 +1,5 @@ Given t(/^the (internal )*frame "([^\"]*)" is visible$/) do |internal, name| - frame(name, internal) + container.set frame(name, internal) end Given t(/^the (internal )*frame "([^\"]*)" is the container$/) do |internal, name| @@ -8,7 +8,8 @@ end When t(/^I activate the (internal )*frame "([^\"]*)"$/) do |internal, name| method = internal ? [ :set_selected, true ] : [ :activate ] - frame(name, internal).send(*method) + frame = frame(name, internal) + frame.send(*method) end Then t(/^the (internal )*frame "([^\"]*)" should be active$/) do |internal, name| lib/swinger/step_definitions/frame_steps.rb @@ -1,3 +1,7 @@ +Given t(/^the tab "([^\"]*)" is visible$/) do |name| + container.set tab(name) +end + Given t(/^the tab "([^\"]*)" is the container$/) do |name| container.set tab(name) end lib/swinger/step_definitions/tab_steps.rb @@ -1,17 +1,17 @@ Feature: Buttons locators and events Scenario: Button clicking - Given the frame "SwingSet" is the container - And the toolbar button "#2" is selected - And the tab "Button Demo" is the container + Given the frame "SwingSet" is visible + And the toolbar button "#2" is selected + And the tab "Button Demo" is visible When I click the button "One" When I click the button "Two" When I click the button "Three!" Scenario Outline: Button clicking with index - Given the frame "SwingSet" is the container - And the toolbar button "#2" is selected - And the tab "Button Demo" is the container + Given the frame "SwingSet" is visible + And the toolbar button "#2" is selected + And the tab "Button Demo" is visible When I click the button "#<button>" Examples: | button | test/features/button.feature @@ -1,11 +1,11 @@ Feature: Checkbox locators and events Background: - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible And the toolbar button "#2" is selected - And the tab "Button Demo" is the container + And the tab "Button Demo" is visible When I select the tab "Check Boxes" - Given the tab "Check Boxes" is the container + Given the tab "Check Boxes" is visible Scenario Outline: Checkbox clicking with names When I click the checkbox "<checkbox>" test/features/checkbox.feature @@ -1,9 +1,9 @@ Feature: Combobox Scenario: Combobox Manipulation - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible And the toolbar button "JComboBox demo" is selected - And the tab "ComboBox Demo" is the container + And the tab "ComboBox Demo" is visible When I change the combobox "#2" to "Jon" Then I should have the combobox "#2" with "Jon" When I change the combobox "#3" to "Jon" test/features/combobox.feature @@ -2,13 +2,12 @@ Feature: Dialog locators and events Scenario: Dialog manipulation Given the frame "SwingSet" is visible - And the frame "SwingSet" is the container When I click the menu "File/About" Then I should see the dialog "About Swing!" - Given the dialog "About Swing!" is the container + Given the dialog "About Swing!" is visible When I click the button "OK" Then I should not see the dialog "About Swing!" - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible When I click the menu "File/About" Then I should see the dialog "About Swing!" When I close the dialog "About Swing!" test/features/dialog.feature @@ -6,9 +6,8 @@ Feature: Frame locators and events Then the frame "SwingSet" should be active Scenario Outline: Internal frame activation - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible And the toolbar button "JInternalFrame demo" is selected - And the internal frame "<frame>" is visible When I activate the internal frame "<frame>" Then the internal frame "<frame>" should be active Examples: @@ -20,9 +19,8 @@ Feature: Frame locators and events | Frame 4 | Scenario Outline: Internal frame manipulation - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible And the toolbar button "JInternalFrame demo" is selected - And the internal frame "<frame>" is visible When I activate the internal frame "<frame>" Then I should see the internal frame "<frame>" When I close the internal frame "<frame>" test/features/frame.feature @@ -1,9 +1,9 @@ Feature: Label manipulation Scenario: Internal frame manipulation - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible And the toolbar button "JInternalFrame demo" is selected - And the internal frame "#1" is the container + And the internal frame "#1" is visible Given I have the label "Frame title:" When I set the label "Frame title:" to "Window Title:" Then the label "Window Title:" should be "Window Title:" \ No newline at end of file test/features/label.feature @@ -1,9 +1,9 @@ Feature: List Scenario: Combobox Manipulation - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible And the toolbar button "JList demo" is selected - And the tab "List Demo" is the container + And the tab "List Demo" is visible When I select "TeraSystems" in the list "#1" Then I should have the list "#1" with "TeraSystems" selected When I select "YoYoTech" in the list "#1" test/features/list.feature @@ -2,7 +2,6 @@ Feature: Menu locators and events Scenario: Menu clicking Given the frame "SwingSet" is visible - And the frame "SwingSet" is the container When I click the menu "File" And I click the menu "Look & Feel" And I click the menu "Look & Feel/Motif Look & Feel" test/features/menu.feature @@ -1,11 +1,11 @@ Feature: Radio Buttons locators and events Background: - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible And the toolbar button "#2" is selected - And the tab "Button Demo" is the container + And the tab "Button Demo" is visible When I select the tab "Radio Buttons" - Given the tab "Radio Buttons" is the container + Given the tab "Radio Buttons" is visible Scenario Outline: Radio Button clicking with names When I click the radio button "<button1>" test/features/radio_button.feature @@ -1,15 +1,15 @@ Feature: Tabs locators and events Scenario: Tab selection - Given the frame "SwingSet" is the container - And the toolbar button "#1" is selected + Given the frame "SwingSet" is visible + And the toolbar button "#1" is selected When I select the tab "Source Code" Then the tab "Source Code" should be selected Scenario: Tab selection 2 - Given the frame "SwingSet" is the container - And the toolbar button "#2" is selected - And the tab "Button Demo" is the container + Given the frame "SwingSet" is visible + And the toolbar button "#2" is selected + And the tab "Button Demo" is visible When I select the tab "Radio Buttons" - And I select the tab "Buttons" - And I select the tab "Check Boxes" \ No newline at end of file + And I select the tab "Buttons" + And I select the tab "Check Boxes" \ No newline at end of file test/features/tab.feature @@ -1,23 +1,23 @@ Feature: Textfield locators and events Scenario: Textfield filling - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible And the toolbar button "JInternalFrame demo" is selected - And the tab "Internal Frames Demo" is the container + And the tab "Internal Frames Demo" is visible When I fill the text field "Frame" with "My Frame Title" Then the text field "My Frame Title" should be "My Frame Title" Scenario: Textfield ordinal - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible And the toolbar button "JInternalFrame demo" is selected - And the tab "Internal Frames Demo" is the container + And the tab "Internal Frames Demo" is visible When I fill the text field "#1" with "My Frame Title 2" Then the text field "#1" should be "My Frame Title 2" # Not passing because we need to modify SwingSet2 source # Scenario: Textfield by label -# Given the frame "SwingSet" is the container +# Given the frame "SwingSet" is visible # And the toolbar button "JInternalFrame demo" is selected -# And the tab "Internal Frames Demo" is the container +# And the tab "Internal Frames Demo" is visible # When I fill the text field "Frame title:" with "My Frame Title 2" # Then the text field "Frame title:" should be "My Frame Title 2" \ No newline at end of file test/features/textfield.feature @@ -1,7 +1,7 @@ Feature: Toolbar button locators and events Scenario Outline: Toolbar button click - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible When I click the toolbar button "#<button>" Then the toolbar button "#<button>" should be selected Examples: @@ -24,6 +24,6 @@ Feature: Toolbar button locators and events | 16 | Scenario: Toolbar button click by tooltip - Given the frame "SwingSet" is the container + Given the frame "SwingSet" is visible When I click the toolbar button "JList demo" Then the toolbar button "JList demo" should be selected \ No newline at end of file test/features/toolbar.feature 8bf74fa4eb3ab4b40e7204c5128a50559d9bd717 Demetrius Nunes demetriusnunes@gmail.com http://github.com/demetriusnunes/swinger/commit/41dc093e2f2bd163c4c39ac2b3abdfa894fdf916 41dc093e2f2bd163c4c39ac2b3abdfa894fdf916 2009-09-29T14:11:19-07:00 2009-09-29T14:11:19-07:00 changed the semantics of the 'Given ... is visible' steps for frames, dialogs and tabbed panes to set the current container automatically so we don't need to keep saying 'Given ... is the container' b9bc2f3f5a67445183751f59615cd7625bacde8e Demetrius Nunes demetriusnunes@gmail.com