selenium_dsl 1.1.0 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. data/.idea/misc.xml +1 -1
  2. data/.idea/selenium_dsl.iml +16 -26
  3. data/.idea/workspace.xml +65 -111
  4. data/CHANGES +4 -0
  5. data/Gemfile +1 -1
  6. data/Gemfile.lock +10 -10
  7. data/lib/selenium_dsl/selenium_webdriver/script.rb +19 -3
  8. data/lib/selenium_dsl/version.rb +1 -1
  9. metadata +3 -3
data/.idea/misc.xml CHANGED
@@ -1,5 +1,5 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <project version="4">
3
- <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-1.9.3-p385 [selenium_dsl]" project-jdk-type="RUBY_SDK" />
3
+ <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-1.9.3-p392 [selenium_dsl]" project-jdk-type="RUBY_SDK" />
4
4
  </project>
5
5
 
data/.idea/selenium_dsl.iml CHANGED
@@ -13,32 +13,22 @@
13
13
  <content url="file://$MODULE_DIR$" />
14
14
  <orderEntry type="inheritedJdk" />
15
15
  <orderEntry type="sourceFolder" forTests="false" />
16
- <orderEntry type="library" scope="PROVIDED" name="archive-tar-minitar (v0.5.2, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
17
- <orderEntry type="library" scope="PROVIDED" name="bundler (v1.2.3, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
18
- <orderEntry type="library" scope="PROVIDED" name="childprocess (v0.3.8, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
19
- <orderEntry type="library" scope="PROVIDED" name="columnize (v0.3.6, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
20
- <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.1.3, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
21
- <orderEntry type="library" scope="PROVIDED" name="ffi (v1.4.0, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
22
- <orderEntry type="library" scope="PROVIDED" name="file_utils (v1.0.6, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
23
- <orderEntry type="library" scope="PROVIDED" name="gemcutter (v0.7.1, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
24
- <orderEntry type="library" scope="PROVIDED" name="gemspec_deps_gen (v1.0.5, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
25
- <orderEntry type="library" scope="PROVIDED" name="jar_wrapper (v0.1.7, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
26
- <orderEntry type="library" scope="PROVIDED" name="linecache19 (v0.5.13, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
27
- <orderEntry type="library" scope="PROVIDED" name="metaclass (v0.0.1, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
28
- <orderEntry type="library" scope="PROVIDED" name="mocha (v0.13.2, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
29
- <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.6.1, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
30
- <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.3, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
31
- <orderEntry type="library" scope="PROVIDED" name="rspec (v2.12.0, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
32
- <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.12.2, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
33
- <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.12.1, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
34
- <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.12.2, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
35
- <orderEntry type="library" scope="PROVIDED" name="ruby-debug-base19x (v0.11.30.pre10, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
36
- <orderEntry type="library" scope="PROVIDED" name="ruby-debug-ide (v0.4.17.beta14, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
37
- <orderEntry type="library" scope="PROVIDED" name="ruby_core_source (v0.1.5, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
38
- <orderEntry type="library" scope="PROVIDED" name="rubyzip (v0.9.9, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
39
- <orderEntry type="library" scope="PROVIDED" name="watir-webdriver (v0.6.2, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
40
- <orderEntry type="library" scope="PROVIDED" name="websocket (v1.0.7, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
41
- <orderEntry type="library" scope="PROVIDED" name="zip (v2.0.2, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" level="application" />
16
+ <orderEntry type="library" scope="PROVIDED" name="bundler (v1.2.3, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
17
+ <orderEntry type="library" scope="PROVIDED" name="childprocess (v0.3.8, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
18
+ <orderEntry type="library" scope="PROVIDED" name="ffi (v1.4.0, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
19
+ <orderEntry type="library" scope="PROVIDED" name="file_utils (v1.0.6, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
20
+ <orderEntry type="library" scope="PROVIDED" name="gemcutter (v0.7.1, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
21
+ <orderEntry type="library" scope="PROVIDED" name="gemspec_deps_gen (v1.0.5, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
22
+ <orderEntry type="library" scope="PROVIDED" name="jar_wrapper (v0.1.7, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
23
+ <orderEntry type="library" scope="PROVIDED" name="metaclass (v0.0.1, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
24
+ <orderEntry type="library" scope="PROVIDED" name="mocha (v0.13.2, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
25
+ <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.6.1, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
26
+ <orderEntry type="library" scope="PROVIDED" name="rubyzip (v0.9.9, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
27
+ <orderEntry type="library" scope="PROVIDED" name="selenium (v0.2.9, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
28
+ <orderEntry type="library" scope="PROVIDED" name="selenium-webdriver (v2.30.0, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
29
+ <orderEntry type="library" scope="PROVIDED" name="watir-webdriver (v0.6.2, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
30
+ <orderEntry type="library" scope="PROVIDED" name="websocket (v1.0.7, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
31
+ <orderEntry type="library" scope="PROVIDED" name="zip (v2.0.2, RVM: ruby-1.9.3-p392 [selenium_dsl]) [gem]" level="application" />
42
32
  </component>
43
33
  </module>
44
34
 
data/.idea/workspace.xml CHANGED
@@ -2,6 +2,13 @@
2
2
  <project version="4">
3
3
  <component name="ChangeListManager">
4
4
  <list default="true" id="4f121c6d-2d22-4993-b695-5f87cc8a9c19" name="Default" comment="">
5
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGES" afterPath="$PROJECT_DIR$/CHANGES" />
6
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
7
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile" afterPath="$PROJECT_DIR$/Gemfile" />
8
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
9
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver/script.rb" afterPath="$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver/script.rb" />
10
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/selenium_dsl.iml" afterPath="$PROJECT_DIR$/.idea/selenium_dsl.iml" />
11
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/selenium_dsl/version.rb" afterPath="$PROJECT_DIR$/lib/selenium_dsl/version.rb" />
5
12
  <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6
13
  </list>
7
14
  <ignored path="selenium_dsl.iws" />
@@ -12,7 +19,7 @@
12
19
  <file path="/README.md" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1360795559375" ignored="false" />
13
20
  <file path="$USER_HOME$/work/ui/src/spec/acceptance/selenium/selenium_dsl.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1360789774819" ignored="false" />
14
21
  <file path="/Rakefile" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361395087532" ignored="false" />
15
- <file path="/CHANGES" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361480236908" ignored="false" />
22
+ <file path="/CHANGES" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361997272771" ignored="false" />
16
23
  <file path="/proxy.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1360796901347" ignored="false" />
17
24
  <file path="/a.dummy" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361409329607" ignored="false" />
18
25
  <file path="/script.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361479487836" ignored="false" />
@@ -26,11 +33,11 @@
26
33
  <file path="/selenium_spec_helper.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361401549198" ignored="false" />
27
34
  <file path="$USER_HOME$/work/ui-r19/src/spec/acceptance/selenium/selenium_spec_helper.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1360792938364" ignored="false" />
28
35
  <file path="/spec_helper2.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1360793356653" ignored="false" />
29
- <file path="/.rvmrc" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1360795614317" ignored="false" />
36
+ <file path="/.rvmrc" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361737851803" ignored="false" />
30
37
  <file path="/spec_helper.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361400018098" ignored="false" />
31
38
  <file path="/access_webapp_spec.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1360796014103" ignored="false" />
32
39
  <file path="/fragment.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361310548521" ignored="false" />
33
- <file path="/Dummy.txt" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361480255406" ignored="false" />
40
+ <file path="/Dummy.txt" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361997131843" ignored="false" />
34
41
  <file path="/dsl.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361478901431" ignored="false" />
35
42
  <file path="$USER_HOME$/work/ui/src/Gemfile.lock" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1360945074826" ignored="false" />
36
43
  <file path="$USER_HOME$/work/ui/src/spec/acceptance/selenium/support/plan_page_steps.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361050776348" ignored="false" />
@@ -64,6 +71,7 @@
64
71
  <file path="$PROJECT_DIR$/../selenium/lib/selenium/version.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361410157540" ignored="false" />
65
72
  <file path="$PROJECT_DIR$/../selenium/CHANGES" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361410182013" ignored="false" />
66
73
  <file path="$PROJECT_DIR$/../selenium/lib/selenium/starter.rb" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361410194909" ignored="false" />
74
+ <file path="$PROJECT_DIR$/../etv/.rvmrc" changelist="4f121c6d-2d22-4993-b695-5f87cc8a9c19" time="1361737852113" ignored="false" />
67
75
  <option name="TRACKING_ENABLED" value="true" />
68
76
  <option name="SHOW_DIALOG" value="false" />
69
77
  <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -92,7 +100,7 @@
92
100
  <file leaf-file-name="version.rb" pinned="false" current="false" current-in-tab="false">
93
101
  <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/version.rb">
94
102
  <provider selected="true" editor-type-id="text-editor">
95
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
103
+ <state line="1" column="18" selection-start="37" selection-end="37" vertical-scroll-proportion="0.0">
96
104
  <folding />
97
105
  </state>
98
106
  </provider>
@@ -101,7 +109,25 @@
101
109
  <file leaf-file-name="CHANGES" pinned="false" current="true" current-in-tab="true">
102
110
  <entry file="file://$PROJECT_DIR$/CHANGES">
103
111
  <provider selected="true" editor-type-id="text-editor">
104
- <state line="8" column="2" selection-start="84" selection-end="101" vertical-scroll-proportion="0.21694915">
112
+ <state line="12" column="1" selection-start="123" selection-end="158" vertical-scroll-proportion="0.32542372">
113
+ <folding />
114
+ </state>
115
+ </provider>
116
+ </entry>
117
+ </file>
118
+ <file leaf-file-name=".rvmrc" pinned="false" current="false" current-in-tab="false">
119
+ <entry file="file://$PROJECT_DIR$/.rvmrc">
120
+ <provider selected="true" editor-type-id="text-editor">
121
+ <state line="3" column="13" selection-start="70" selection-end="70" vertical-scroll-proportion="0.0">
122
+ <folding />
123
+ </state>
124
+ </provider>
125
+ </entry>
126
+ </file>
127
+ <file leaf-file-name="Gemfile" pinned="false" current="false" current-in-tab="false">
128
+ <entry file="file://$PROJECT_DIR$/Gemfile">
129
+ <provider selected="true" editor-type-id="text-editor">
130
+ <state line="3" column="144" selection-start="70" selection-end="70" vertical-scroll-proportion="0.0">
105
131
  <folding />
106
132
  </state>
107
133
  </provider>
@@ -119,7 +145,7 @@
119
145
  <file leaf-file-name="script.rb" pinned="false" current="false" current-in-tab="false">
120
146
  <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver/script.rb">
121
147
  <provider selected="true" editor-type-id="text-editor">
122
- <state line="14" column="30" selection-start="322" selection-end="322" vertical-scroll-proportion="0.0">
148
+ <state line="20" column="0" selection-start="0" selection-end="1775" vertical-scroll-proportion="0.0">
123
149
  <folding />
124
150
  </state>
125
151
  </provider>
@@ -153,8 +179,6 @@
153
179
  <component name="IdeDocumentHistory">
154
180
  <option name="changedFiles">
155
181
  <list>
156
- <option value="$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver_dsl.rb" />
157
- <option value="$PROJECT_DIR$/lib/selenium_dsl/version.rb" />
158
182
  <option value="$PROJECT_DIR$/lib/selenium_dsl/selenium_helper.rb" />
159
183
  <option value="$PROJECT_DIR$/lib/selenium_dsl/selenium_client/dsl.rb" />
160
184
  <option value="$PROJECT_DIR$/lib/selenium_dsl/capybara/script.rb" />
@@ -162,12 +186,14 @@
162
186
  <option value="$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver/dsl.rb" />
163
187
  <option value="$PROJECT_DIR$/Rakefile" />
164
188
  <option value="$PROJECT_DIR$/lib/selenium_dsl/watir_webdriver/script.rb" />
165
- <option value="$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver/script.rb" />
166
- <option value="$PROJECT_DIR$/Gemfile" />
167
189
  <option value="$PROJECT_DIR$/spec/spec_helper.rb" />
168
190
  <option value="$PROJECT_DIR$/lib/selenium_dsl/watir_webdriver/dsl.rb" />
169
191
  <option value="$PROJECT_DIR$/lib/selenium_dsl.rb" />
170
192
  <option value="$PROJECT_DIR$/spec/access_wikipedia_spec.rb" />
193
+ <option value="$PROJECT_DIR$/Gemfile" />
194
+ <option value="$PROJECT_DIR$/.rvmrc" />
195
+ <option value="$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver/script.rb" />
196
+ <option value="$PROJECT_DIR$/lib/selenium_dsl/version.rb" />
171
197
  <option value="$PROJECT_DIR$/CHANGES" />
172
198
  </list>
173
199
  </option>
@@ -204,6 +230,7 @@
204
230
  <sortByType />
205
231
  </navigator>
206
232
  <panes>
233
+ <pane id="Scope" />
207
234
  <pane id="ProjectPane">
208
235
  <subPane>
209
236
  <PATH>
@@ -211,64 +238,6 @@
211
238
  <option name="myItemId" value="selenium_dsl" />
212
239
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
213
240
  </PATH_ELEMENT>
214
- <PATH_ELEMENT>
215
- <option name="myItemId" value="External Libraries" />
216
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
217
- </PATH_ELEMENT>
218
- </PATH>
219
- <PATH>
220
- <PATH_ELEMENT>
221
- <option name="myItemId" value="selenium_dsl" />
222
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
223
- </PATH_ELEMENT>
224
- <PATH_ELEMENT>
225
- <option name="myItemId" value="External Libraries" />
226
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
227
- </PATH_ELEMENT>
228
- <PATH_ELEMENT>
229
- <option name="myItemId" value="watir-webdriver (v0.6.2, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" />
230
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
231
- </PATH_ELEMENT>
232
- </PATH>
233
- <PATH>
234
- <PATH_ELEMENT>
235
- <option name="myItemId" value="selenium_dsl" />
236
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
237
- </PATH_ELEMENT>
238
- <PATH_ELEMENT>
239
- <option name="myItemId" value="External Libraries" />
240
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
241
- </PATH_ELEMENT>
242
- <PATH_ELEMENT>
243
- <option name="myItemId" value="watir-webdriver (v0.6.2, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" />
244
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
245
- </PATH_ELEMENT>
246
- <PATH_ELEMENT>
247
- <option name="myItemId" value="lib" />
248
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
249
- </PATH_ELEMENT>
250
- </PATH>
251
- <PATH>
252
- <PATH_ELEMENT>
253
- <option name="myItemId" value="selenium_dsl" />
254
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
255
- </PATH_ELEMENT>
256
- <PATH_ELEMENT>
257
- <option name="myItemId" value="External Libraries" />
258
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
259
- </PATH_ELEMENT>
260
- <PATH_ELEMENT>
261
- <option name="myItemId" value="watir-webdriver (v0.6.2, RVM: ruby-1.9.3-p385 [selenium_dsl]) [gem]" />
262
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
263
- </PATH_ELEMENT>
264
- <PATH_ELEMENT>
265
- <option name="myItemId" value="lib" />
266
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
267
- </PATH_ELEMENT>
268
- <PATH_ELEMENT>
269
- <option name="myItemId" value="watir-webdriver" />
270
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
271
- </PATH_ELEMENT>
272
241
  </PATH>
273
242
  <PATH>
274
243
  <PATH_ELEMENT>
@@ -416,18 +385,17 @@
416
385
  </PATH>
417
386
  </subPane>
418
387
  </pane>
419
- <pane id="Scope" />
420
388
  </panes>
421
389
  </component>
422
390
  <component name="PropertiesComponent">
423
391
  <property name="options.splitter.main.proportions" value="0.3" />
424
392
  <property name="WebServerToolWindowFactoryState" value="false" />
425
- <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
426
393
  <property name="recentsLimit" value="5" />
394
+ <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
427
395
  <property name="restartRequiresConfirmation" value="true" />
428
396
  <property name="FullScreen" value="false" />
429
- <property name="options.searchVisible" value="true" />
430
397
  <property name="options.splitter.details.proportions" value="0.2" />
398
+ <property name="options.searchVisible" value="true" />
431
399
  </component>
432
400
  <component name="RecentsManager">
433
401
  <key name="MoveFile.RECENT_KEYS">
@@ -790,13 +758,11 @@
790
758
  <frame x="91" y="22" width="1589" height="1028" extended-state="0" />
791
759
  <editor active="true" />
792
760
  <layout>
793
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32957748" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
794
761
  <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3376206" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
795
762
  <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
796
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3290461" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
797
763
  <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
798
764
  <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
799
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28256643" sideWeight="0.66237944" order="0" side_tool="false" content_ui="combo" />
765
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.294232" sideWeight="0.66237944" order="0" side_tool="false" content_ui="combo" />
800
766
  <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.34297964" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
801
767
  <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
802
768
  <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -805,6 +771,8 @@
805
771
  <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
806
772
  <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
807
773
  <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
774
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3290461" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
775
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32957748" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
808
776
  <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
809
777
  <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
810
778
  <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -889,105 +857,91 @@
889
857
  </entry>
890
858
  <entry file="file://$PROJECT_DIR$/Rakefile">
891
859
  <provider selected="true" editor-type-id="text-editor">
892
- <state line="15" column="0" selection-start="282" selection-end="282" vertical-scroll-proportion="0.0">
893
- <folding />
894
- </state>
860
+ <state line="15" column="0" selection-start="282" selection-end="282" vertical-scroll-proportion="0.0" />
895
861
  </provider>
896
862
  </entry>
897
863
  <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/capybara/dsl.rb">
898
864
  <provider selected="true" editor-type-id="text-editor">
899
- <state line="33" column="16" selection-start="1142" selection-end="1142" vertical-scroll-proportion="0.0">
900
- <folding />
901
- </state>
865
+ <state line="33" column="16" selection-start="1142" selection-end="1142" vertical-scroll-proportion="0.0" />
902
866
  </provider>
903
867
  </entry>
904
868
  <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/selenium_client/script.rb">
905
869
  <provider selected="true" editor-type-id="text-editor">
906
- <state line="105" column="8" selection-start="2479" selection-end="2479" vertical-scroll-proportion="0.0">
907
- <folding />
908
- </state>
870
+ <state line="105" column="8" selection-start="2479" selection-end="2479" vertical-scroll-proportion="0.0" />
909
871
  </provider>
910
872
  </entry>
911
873
  <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/selenium_helper.rb">
912
874
  <provider selected="true" editor-type-id="text-editor">
913
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
914
- <folding />
915
- </state>
875
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
916
876
  </provider>
917
877
  </entry>
918
878
  <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/watir_webdriver/script.rb">
919
879
  <provider selected="true" editor-type-id="text-editor">
920
- <state line="12" column="86" selection-start="259" selection-end="259" vertical-scroll-proportion="0.0">
921
- <folding />
922
- </state>
880
+ <state line="12" column="86" selection-start="259" selection-end="259" vertical-scroll-proportion="0.0" />
923
881
  </provider>
924
882
  </entry>
925
- <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver/dsl.rb">
883
+ <entry file="file://$PROJECT_DIR$/lib/selenium_dsl.rb">
926
884
  <provider selected="true" editor-type-id="text-editor">
927
- <state line="24" column="0" selection-start="833" selection-end="833" vertical-scroll-proportion="0.0">
928
- <folding />
929
- </state>
885
+ <state line="7" column="35" selection-start="255" selection-end="255" vertical-scroll-proportion="0.1891892" />
930
886
  </provider>
931
887
  </entry>
932
- <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver/script.rb">
888
+ <entry file="file://$PROJECT_DIR$/spec/spec_helper.rb">
933
889
  <provider selected="true" editor-type-id="text-editor">
934
- <state line="14" column="30" selection-start="322" selection-end="322" vertical-scroll-proportion="0.0">
935
- <folding />
936
- </state>
890
+ <state line="10" column="0" selection-start="309" selection-end="309" vertical-scroll-proportion="-0.5405405" />
937
891
  </provider>
938
892
  </entry>
939
- <entry file="file://$PROJECT_DIR$/lib/selenium_dsl.rb">
893
+ <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/watir_webdriver/dsl.rb">
940
894
  <provider selected="true" editor-type-id="text-editor">
941
- <state line="7" column="35" selection-start="255" selection-end="255" vertical-scroll-proportion="0.1891892">
895
+ <state line="21" column="101" selection-start="590" selection-end="590" vertical-scroll-proportion="0.0">
942
896
  <folding />
943
897
  </state>
944
898
  </provider>
945
899
  </entry>
946
- <entry file="file://$PROJECT_DIR$/spec/spec_helper.rb">
900
+ <entry file="file://$PROJECT_DIR$/spec/access_wikipedia_spec.rb">
947
901
  <provider selected="true" editor-type-id="text-editor">
948
- <state line="10" column="0" selection-start="309" selection-end="309" vertical-scroll-proportion="-0.5405405">
902
+ <state line="86" column="98" selection-start="2221" selection-end="2221" vertical-scroll-proportion="0.0">
949
903
  <folding />
950
904
  </state>
951
905
  </provider>
952
906
  </entry>
953
- <entry file="file://$PROJECT_DIR$/Gemfile">
907
+ <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver/dsl.rb">
954
908
  <provider selected="true" editor-type-id="text-editor">
955
- <state line="3" column="23" selection-start="57" selection-end="57" vertical-scroll-proportion="0.08108108">
909
+ <state line="24" column="0" selection-start="833" selection-end="833" vertical-scroll-proportion="0.0">
956
910
  <folding />
957
911
  </state>
958
912
  </provider>
959
913
  </entry>
960
- <entry file="file://$USER_HOME$/.rvm/gems/ruby-1.9.3-p385@selenium_dsl/gems/watir-webdriver-0.6.2/lib/watir-webdriver/browser.rb">
914
+ <entry file="file://$PROJECT_DIR$/Gemfile">
961
915
  <provider selected="true" editor-type-id="text-editor">
962
- <state line="7" column="8" selection-start="107" selection-end="107" vertical-scroll-proportion="-9.810811">
916
+ <state line="3" column="144" selection-start="70" selection-end="70" vertical-scroll-proportion="0.0">
963
917
  <folding />
964
918
  </state>
965
919
  </provider>
966
920
  </entry>
967
- <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/watir_webdriver/dsl.rb">
921
+ <entry file="file://$PROJECT_DIR$/.rvmrc">
968
922
  <provider selected="true" editor-type-id="text-editor">
969
- <state line="21" column="101" selection-start="590" selection-end="590" vertical-scroll-proportion="0.0">
923
+ <state line="3" column="13" selection-start="70" selection-end="70" vertical-scroll-proportion="0.0">
970
924
  <folding />
971
925
  </state>
972
926
  </provider>
973
927
  </entry>
974
- <entry file="file://$PROJECT_DIR$/spec/access_wikipedia_spec.rb">
928
+ <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/selenium_webdriver/script.rb">
975
929
  <provider selected="true" editor-type-id="text-editor">
976
- <state line="86" column="98" selection-start="2221" selection-end="2221" vertical-scroll-proportion="0.0">
930
+ <state line="20" column="0" selection-start="0" selection-end="1775" vertical-scroll-proportion="0.0">
977
931
  <folding />
978
932
  </state>
979
933
  </provider>
980
934
  </entry>
981
935
  <entry file="file://$PROJECT_DIR$/lib/selenium_dsl/version.rb">
982
936
  <provider selected="true" editor-type-id="text-editor">
983
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
937
+ <state line="1" column="18" selection-start="37" selection-end="37" vertical-scroll-proportion="0.0">
984
938
  <folding />
985
939
  </state>
986
940
  </provider>
987
941
  </entry>
988
942
  <entry file="file://$PROJECT_DIR$/CHANGES">
989
943
  <provider selected="true" editor-type-id="text-editor">
990
- <state line="8" column="2" selection-start="84" selection-end="101" vertical-scroll-proportion="0.21694915">
944
+ <state line="12" column="1" selection-start="123" selection-end="158" vertical-scroll-proportion="0.32542372">
991
945
  <folding />
992
946
  </state>
993
947
  </provider>
data/CHANGES CHANGED
@@ -7,3 +7,7 @@
7
7
  == Version 1.1.0
8
8
 
9
9
  * Internal redesign.
10
+
11
+ == Version 1.2.0
12
+
13
+ * Changes in wait_for_condition API.
data/Gemfile CHANGED
@@ -1,4 +1,4 @@
1
- source :rubygems
1
+ source "https://rubygems.org"
2
2
 
3
3
  gem "selenium-webdriver"
4
4
  gem "selenium"
data/Gemfile.lock CHANGED
@@ -1,11 +1,11 @@
1
1
  GEM
2
- remote: http://rubygems.org/
2
+ remote: https://rubygems.org/
3
3
  specs:
4
4
  archive-tar-minitar (0.5.2)
5
5
  childprocess (0.3.8)
6
6
  ffi (~> 1.0, >= 1.0.11)
7
7
  columnize (0.3.6)
8
- diff-lcs (1.1.3)
8
+ diff-lcs (1.2.1)
9
9
  ffi (1.4.0)
10
10
  file_utils (1.0.6)
11
11
  gemcutter (0.7.1)
@@ -20,14 +20,14 @@ GEM
20
20
  metaclass (~> 0.0.1)
21
21
  multi_json (1.6.1)
22
22
  rake (10.0.3)
23
- rspec (2.12.0)
24
- rspec-core (~> 2.12.0)
25
- rspec-expectations (~> 2.12.0)
26
- rspec-mocks (~> 2.12.0)
27
- rspec-core (2.12.2)
28
- rspec-expectations (2.12.1)
29
- diff-lcs (~> 1.1.3)
30
- rspec-mocks (2.12.2)
23
+ rspec (2.13.0)
24
+ rspec-core (~> 2.13.0)
25
+ rspec-expectations (~> 2.13.0)
26
+ rspec-mocks (~> 2.13.0)
27
+ rspec-core (2.13.0)
28
+ rspec-expectations (2.13.0)
29
+ diff-lcs (>= 1.1.3, < 2.0)
30
+ rspec-mocks (2.13.0)
31
31
  ruby-debug-base19x (0.11.30.pre10)
32
32
  columnize (>= 0.3.1)
33
33
  linecache19 (>= 0.5.11)
data/lib/selenium_dsl/selenium_webdriver/script.rb CHANGED
@@ -23,10 +23,26 @@ module SeleniumDSL::SeleniumWebdriver
23
23
  end
24
24
  end
25
25
 
26
- def wait_for_condition(type, query, condition)
27
- wait = ::Selenium::WebDriver::Wait.new(:timeout => @timeout_in_seconds) # seconds
26
+ def generic_condition block
27
+ lambda do
28
+ block.call()
29
+ end
30
+ end
31
+
32
+ def wait_for_condition(*params)
33
+ if params.size == 1
34
+ condition = *params
35
+
36
+ wait = ::Selenium::WebDriver::Wait.new(:timeout => @timeout_in_seconds) # seconds
28
37
 
29
- wait.until { condition.call(type, query) }
38
+ wait.until { condition.call() }
39
+ elsif params.size == 3
40
+ type, query, condition = *params
41
+
42
+ wait = ::Selenium::WebDriver::Wait.new(:timeout => @timeout_in_seconds) # seconds
43
+
44
+ wait.until { condition.call(type, query) }
45
+ end
30
46
  end
31
47
 
32
48
  def is_text_present type, query, value
data/lib/selenium_dsl/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SeleniumDSL
2
- VERSION = "1.1.0"
2
+ VERSION = "1.2.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: selenium_dsl
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.2.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-02-21 00:00:00.000000000 Z
12
+ date: 2013-02-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: selenium-webdriver
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
128
128
  version: '0'
129
129
  segments:
130
130
  - 0
131
- hash: -2763678583655684477
131
+ hash: -2346617096350053193
132
132
  required_rubygems_version: !ruby/object:Gem::Requirement
133
133
  none: false
134
134
  requirements: