Merge pull request #34 from DrMarcII/master

v 1.4.0

dart/lib/clock.dart

@@ -1,17 +1,16 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2014 Google Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 library pageloader.clock;
 
 /// Interface used to abstract away waiting mechanisms.

dart/lib/html.dart

@@ -1,30 +1,30 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2014 Google Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 /// PageLoader HTML provides the necessary bindings to support using PageLoader
 /// Objects in tests that run within the browser.
 library pageloader.html;
 
+import 'dart:async' show Future;
+import 'dart:collection';
+import 'dart:html';
+import 'dart:mirrors' hide Comment;
+
 import 'clock.dart';
 import 'src/core.dart';
 import 'src/interfaces.dart';
 export 'src/interfaces.dart';
 
-import 'dart:collection';
-import 'dart:html';
-import 'dart:mirrors' hide Comment;
-
 /// A function that will be executed after [click] and [type] and during
 /// [waitFor] and [waitForValue] to allow events to be processed. For example
 /// if using Angular's async test wrapper this should be a function that calls

dart/lib/objects.dart

@@ -1,17 +1,16 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2014 Google Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 /// PageLoader Objects provides the core interface and annotation definitions
 /// that should be used within PageLoader Objects.
 library pageloader.objects;

dart/lib/src/annotations.dart

@@ -1,23 +1,22 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-library pageloader.annotations;
+// Copyright 2014 Google Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-import 'interfaces.dart';
+library pageloader.annotations;
 
 import 'dart:collection';
 
+import 'interfaces.dart';
+
 class ById implements Finder {
   final String id;
 
@@ -91,21 +90,52 @@ class EnsureTag implements Finder {
 }
 
 class InShadowDom implements Finder {
-  final Finder finder;
+  final Finder of;
+  final Finder find;
 
-  const InShadowDom([this.finder]);
+  /// Traverses into the shadow dom of the elements found by [of] (or of the
+  /// current scope if [of] not provided), and then finds elements using [find]
+  /// if provided.
+  const InShadowDom({this.of, this.find});
 
   @override
   List<PageLoaderElement> findElements(PageLoaderElement context) {
-    if (finder == null) {
-      return new UnmodifiableListView<PageLoaderElement>([context.shadowRoot]);
+    Iterable<PageLoaderElement> candidates;
+    if (of != null) {
+      candidates = of.findElements(context);
     } else {
-      return finder.findElements(context.shadowRoot);
+      candidates = [context];
     }
+    candidates = candidates.map((candidate) => candidate.shadowRoot);
+    if (find != null) {
+      var newCandidates = new Set();
+      for (var candidate in candidates) {
+        newCandidates.addAll(find.findElements(candidate));
+      }
+      candidates = newCandidates;
+    }
+    return new UnmodifiableListView<PageLoaderElement>(candidates);
   }
 
   @override
-  String toString() => '@InShadowDom(${finder == null ? '' : finder})';
+  String toString() {
+    var buffer = new StringBuffer('@InShadowDom(');
+    bool commaNeeded = false;
+    if (of != null) {
+      buffer
+        ..write('of: ')
+        ..write(of);
+      commaNeeded = true;
+    }
+    if (find != null) {
+      if (commaNeeded) buffer.write(', ');
+      buffer
+        ..write('find: ')
+        ..write(find);
+    }
+    buffer.write(')');
+    return buffer.toString();
+  }
 }
 
 class Returns {

dart/lib/src/core.dart

@@ -1,27 +1,26 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2014 Google Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 library pageloader.core;
 
-import 'annotations.dart';
-import 'interfaces.dart';
-import '../clock.dart';
+import 'dart:collection';
+import 'dart:mirrors';
 
 import 'package:matcher/matcher.dart';
 
-import 'dart:collection';
-import 'dart:mirrors';
+import '../clock.dart';
+import 'annotations.dart';
+import 'interfaces.dart';
 
 bool _printedWarning = false;
 

dart/lib/src/interfaces.dart

@@ -1,23 +1,22 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-library pageloader.interfaces;
+// Copyright 2014 Google Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-import 'package:matcher/matcher.dart';
+library pageloader.interfaces;
 
 import 'dart:collection';
 
+import 'package:matcher/matcher.dart';
+
 abstract class Lazy<T> {
   T call();
 }

dart/lib/webdriver.dart

@@ -1,31 +1,30 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2014 Google Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 /// PageLoader WebDriver provides the necessary bindings to support using
 /// PageLoader in WebDriver-based tests.
 library pageloader.webdriver;
 
-import 'clock.dart';
-import 'src/core.dart';
-import 'src/interfaces.dart';
-export 'src/interfaces.dart';
-
 import 'dart:collection';
 import 'dart:io' as io;
 
 import 'package:sync_webdriver/sync_webdriver.dart' as wd;
 
+import 'clock.dart';
+import 'src/core.dart';
+import 'src/interfaces.dart';
+export 'src/interfaces.dart';
+
 class WebDriverPageLoader extends BasePageLoader {
   WebDriverPageLoaderElement _globalContext;
   @override

dart/pubspec.yaml

@@ -1,5 +1,5 @@
 name: pageloader
-version: 1.3.2
+version: 1.4.0
 author: Google Inc.
 description: >
   Supports the creation of page objects that can be shared between in-browser tests
@@ -9,7 +9,7 @@ environment:
   sdk: '>=1.8.0 <2.0.0'
 dependencies:
   matcher: '^0.11.4+1'
-  sync_webdriver: '^1.1.4'
+  sync_webdriver: '^1.1.4+1'
 dev_dependencies:
   browser: '^0.10.0+2'
   path: '^1.3.3'