Merge pull request #67 from goderbauer/seperation

Divide async and sync pageloader into two packages

.travis.yml

@@ -5,6 +5,12 @@ dart:
   - dev
   - stable
 
+with_content_shell: true
+
+matrix:
+  allow_failures:
+    - dart: dev
+
 before_install:
   - export CHROMEDRIVER_BINARY=/usr/bin/chromium-browser
   - export CHROMEDRIVER_ARGS=--no-sandbox
@@ -19,6 +25,9 @@ before_script:
   - wget http://chromedriver.storage.googleapis.com/2.12/chromedriver_linux64.zip
   - unzip chromedriver_linux64.zip
   - export PATH=$PATH:$PWD
-  - ./dart/tool/travis-setup.sh
+  - ./dart/async/tool/travis-setup.sh
+  - ./dart/sync/tool/travis-setup.sh
 
-script: ./dart/tool/travis.sh
+script: 
+  - ./dart/async/tool/travis.sh
+  - ./dart/sync/tool/travis.sh

README.md

@@ -2,7 +2,6 @@ PageLoader
 ==========
 
 [![Build Status](https://travis-ci.org/google/pageloader.svg?branch=master)](https://travis-ci.org/google/pageloader)
-[![pub package](https://img.shields.io/pub/v/pageloader.svg)](https://pub.dartlang.org/packages/pageloader)
 
 A framework for creating page objects for in-browser tests or
 WebDriver tests.
@@ -11,10 +10,16 @@ PageLoader for Dart comes in two flavours: async and sync.
 
 Async PageLoader for Dart
 -------------------------
+
+[![pub package](https://img.shields.io/pub/v/pageloader.svg)](https://pub.dartlang.org/packages/pageloader)
+
 Async PageLoader for Dart is the **recommended** version going forward. It is designed to work with [webdriver.dart](https://github.com/google/webdriver.dart). 
 
 Sync PageLoader for Dart
 ------------------------
+
+[![pub package](https://img.shields.io/pub/v/sync_pageloader.svg)](https://pub.dartlang.org/packages/sync_pageloader)
+
 The sync version is **deprecated** and will eventually be **removed** from this repository.
 Consider switching to the async version.
 

dart/lib/async/html.dart → dart/async/lib/html.dart

@@ -13,7 +13,7 @@
 
 /// PageLoader HTML provides the necessary bindings to support using PageLoader
 /// Objects in tests that run within the browser.
-library pageloader.async.html;
+library pageloader.html;
 
 import 'dart:async';
 import 'dart:html';

dart/lib/async/objects.dart → dart/async/lib/objects.dart

@@ -13,7 +13,7 @@
 
 /// PageLoader Objects provides the core interface and annotation definitions
 /// that should be used within PageLoader Objects.
-library pageloader.async.objects;
+library pageloader.objects;
 
 export 'src/annotations.dart';
 export 'src/interfaces.dart';

dart/lib/async/src/annotations.dart → dart/async/lib/src/annotations.dart

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.annotations;
+library pageloader.annotations;
 
 import 'dart:async';
 

dart/lib/async/src/core.dart → dart/async/lib/src/core.dart

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.core;
+library pageloader.core;
 
 import 'dart:async';
 import 'dart:collection';

dart/lib/async/src/interfaces.dart → dart/async/lib/src/interfaces.dart

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.interfaces;
+library pageloader.interfaces;
 
 import 'dart:async';
 import 'dart:math';

dart/lib/async/webdriver.dart → dart/async/lib/webdriver.dart

@@ -13,7 +13,7 @@
 
 /// PageLoader WebDriver provides the necessary bindings to support using
 /// PageLoader in WebDriver-based tests.
-library pageloader.async.webdriver;
+library pageloader.webdriver;
 
 import 'dart:async';
 import 'dart:math';

dart/async/pubspec.yaml

@@ -0,0 +1,15 @@
+name: pageloader
+version: 2.0.0-pre.14
+author: Marc Fisher II <[email protected]>
+description: >
+  Supports the creation of page objects that can be shared between in-browser tests
+  and WebDriver tests.
+homepage: https://github.com/google/pageloader
+environment:
+  sdk: '>=1.11.0 <2.0.0'
+dependencies:
+  stack_trace: '^1.3.4'
+  webdriver: '^0.10.0-pre.15'
+dev_dependencies:
+  path: '^1.3.6'
+  test: '^0.12.3+9'

dart/test/async/html_no_shadow_dom_test.dart → dart/async/test/html_no_shadow_dom_test.dart

@@ -12,15 +12,15 @@
 // limitations under the License.
 
 @TestOn('browser')
-library pageloader.async.test.html_no_shadow_dom;
+library pageloader.test.html_no_shadow_dom;
 
 import 'dart:async';
 
-import 'package:pageloader/async/html.dart';
+import 'package:pageloader/html.dart';
 
 import 'package:test/test.dart';
 
-import '../data/html_no_shadow_dom_setup.dart' as html_setup;
+import 'data/html_no_shadow_dom_setup.dart' as html_setup;
 import 'src/common.dart' as plt;
 import 'src/html_pageloader.dart' as html_test;
 import 'src/shared.dart' as shared;

dart/test/async/html_test.dart → dart/async/test/html_test.dart

@@ -12,14 +12,14 @@
 // limitations under the License.
 
 @TestOn('browser')
-library pageloader.async.test.html_no_shadow_dom;
+library pageloader.test.html_no_shadow_dom;
 
 import 'dart:async';
 
-import 'package:pageloader/async/html.dart';
+import 'package:pageloader/html.dart';
 import 'package:test/test.dart';
 
-import '../data/html_setup.dart' as html_setup;
+import 'data/html_setup.dart' as html_setup;
 import 'src/common.dart' as plt;
 import 'src/html_pageloader.dart' as html_test;
 import 'src/shared.dart' as shared;

dart/test/async/src/annotations.dart → dart/async/test/src/annotations.dart

@@ -11,10 +11,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.test.annotation;
+library pageloader.test.annotation;
 
 import 'dart:async';
-import 'package:pageloader/async/objects.dart';
+import 'package:pageloader/objects.dart';
 import 'package:test/test.dart';
 import 'shared.dart';
 

dart/test/async/src/attributes.dart → dart/async/test/src/attributes.dart

@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.test.attribute;
+library pageloader.test.attribute;
 
-import 'package:pageloader/async/objects.dart';
+import 'package:pageloader/objects.dart';
 import 'package:test/test.dart';
 import 'shared.dart';
 

dart/test/async/src/basic.dart → dart/async/test/src/basic.dart

@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.test.basic;
+library pageloader.test.basic;
 
-import 'package:pageloader/async/objects.dart';
+import 'package:pageloader/objects.dart';
 import 'package:test/test.dart';
 import 'shared.dart';
 
@@ -95,6 +95,8 @@ void runTests() {
 
       await page.textfield.blur();
       expect(await page.textfield.isFocused, false);
+    }, onPlatform: {
+      'content-shell': new Skip('Focus events do not work in content-shell')
     });
 
     test('classes', () async {

dart/test/async/src/common.dart → dart/async/test/src/common.dart

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.test;
+library pageloader.test;
 
 import 'package:test/test.dart';
 

dart/test/async/src/display_filtering.dart → dart/async/test/src/display_filtering.dart

@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.test.display_filtering;
+library pageloader.test.display_filtering;
 
-import 'package:pageloader/async/objects.dart';
+import 'package:pageloader/objects.dart';
 import 'package:test/test.dart';
 import 'shared.dart';
 

dart/test/async/src/errors.dart → dart/async/test/src/errors.dart

@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.test.error;
+library pageloader.test.error;
 
-import 'package:pageloader/async/objects.dart';
+import 'package:pageloader/objects.dart';
 import 'package:test/test.dart';
 import 'shared.dart';
 

dart/test/async/src/html_pageloader.dart → dart/async/test/src/html_pageloader.dart

@@ -10,13 +10,13 @@
 // 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.async.test.html;
+library pageloader.test.html;
 
 import 'dart:async';
 import 'dart:html' as html;
 
-import 'package:pageloader/async/html.dart';
-import 'package:pageloader/async/objects.dart';
+import 'package:pageloader/html.dart';
+import 'package:pageloader/objects.dart';
 import 'package:test/test.dart';
 import 'shared.dart';
 

dart/test/async/src/mouse.dart → dart/async/test/src/mouse.dart

@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.test.mouse;
+library pageloader.test.mouse;
 
-import 'package:pageloader/async/objects.dart';
+import 'package:pageloader/objects.dart';
 import 'package:test/test.dart';
 import 'package:webdriver/support/async.dart';
 import 'shared.dart';

dart/test/async/src/shadow_dom.dart → dart/async/test/src/shadow_dom.dart

@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.test.shadow_dom;
+library pageloader.test.shadow_dom;
 
-import 'package:pageloader/async/objects.dart';
+import 'package:pageloader/objects.dart';
 import 'package:test/test.dart';
 import 'shared.dart';
 

dart/test/async/src/shared.dart → dart/async/test/src/shared.dart

@@ -11,10 +11,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.test.shared;
+library pageloader.test.shared;
 
 import 'package:test/test.dart';
-import 'package:pageloader/async/objects.dart';
+import 'package:pageloader/objects.dart';
 
 PageLoader loader;
 

dart/test/async/src/typing.dart → dart/async/test/src/typing.dart

@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-library pageloader.async.test.typing;
+library pageloader.test.typing;
 
-import 'package:pageloader/async/objects.dart';
+import 'package:pageloader/objects.dart';
 import 'package:test/test.dart';
 import 'shared.dart';
 

dart/test/async/webdriver_no_shadow_dom_test.dart → dart/async/test/webdriver_no_shadow_dom_test.dart

@@ -12,12 +12,12 @@
 // limitations under the License.
 
 @TestOn('vm')
-library pageloader.async.test.webdriver;
+library pageloader.test.webdriver;
 
 import 'dart:async';
 import 'dart:io';
 
-import 'package:pageloader/async/webdriver.dart' show WebDriverPageLoader;
+import 'package:pageloader/webdriver.dart' show WebDriverPageLoader;
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 import 'package:webdriver/io.dart' show Capabilities, WebDriver, createDriver;

dart/test/async/webdriver_test.dart → dart/async/test/webdriver_test.dart

@@ -12,12 +12,12 @@
 // limitations under the License.
 
 @TestOn('vm')
-library pageloader.async.test.webdriver;
+library pageloader.test.webdriver;
 
 import 'dart:async';
 import 'dart:io';
 
-import 'package:pageloader/async/webdriver.dart' show WebDriverPageLoader;
+import 'package:pageloader/webdriver.dart' show WebDriverPageLoader;
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 import 'package:webdriver/io.dart' show Capabilities, WebDriver, createDriver;

dart/async/tool/publish.sh

@@ -0,0 +1,11 @@
+set -e
+
+if [ ! -f pubspec.yaml ]; then
+    echo "Error: No pubspec.yml in working directory."
+    exit
+fi
+
+cp ../../LICENSE LICENSE
+cp ../../README.md README.md
+pub get
+pub publish

dart/tool/travis-setup.sh → dart/async/tool/travis-setup.sh

@@ -17,7 +17,6 @@
 # Fast fail the script on failures.
 set -e
 
-cd dart
+cd dart/async
 
 pub get
-packages/sync_socket/../tool/build.sh

dart/async/tool/travis.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Copyright 2013 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.
+
+# Fast fail the script on failures.
+set -e
+
+cd dart/async
+
+# Verify that the libraries are error free.
+pub global activate tuneup
+pub global run tuneup check
+
+# Start chromedriver.
+chromedriver --port=4444 --url-base=wd/hub &
+PID=$!
+
+# Run tests.
+pub run test -r expanded -p vm,content-shell
+
+# Exit chromedriver
+kill $PID