You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/07/24 19:02:29 UTC
[1/3] git commit: Update jasmine-maven-plugin to 1.3.1.5
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 048920572 -> 8030224f1
Update jasmine-maven-plugin to 1.3.1.5
Run tests in the browser with `mvn jasmine:bdd'.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d2960e02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d2960e02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d2960e02
Branch: refs/heads/master
Commit: d2960e021d3a1f56b547ecc734215cea87588638
Parents: 0489205
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Jul 24 11:42:01 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Jul 24 17:59:25 2014 +0100
----------------------------------------------------------------------
pom.xml | 5 +-
usage/jsgui/pom.xml | 63 +++++++++++---------
.../webapp/assets/js/view/effector-invoke.js | 3 +-
.../specs/view/effector-invoke-spec.js | 4 +-
4 files changed, 39 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d2960e02/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b67ae2b..328f41d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,10 +173,7 @@
<maven-replacer-plugin.version>1.5.2</maven-replacer-plugin.version>
<nodejs-maven-plugin.version>1.0.3</nodejs-maven-plugin.version>
<nodejs-maven-binaries.version>0.10.25</nodejs-maven-binaries.version>
- <jasmine-maven-plugin.version>1.2.0.0</jasmine-maven-plugin.version>
-<!-- see comment about fixtures in brooklyn-jsgui
- <jasmine-maven-plugin.version>1.3.1.2</jasmine-maven-plugin.version>
--->
+ <jasmine-maven-plugin.version>1.3.1.5</jasmine-maven-plugin.version>
<requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
<eclipse-m2e.version>1.0.0</eclipse-m2e.version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d2960e02/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 427c997..57be5a8 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -107,23 +107,16 @@
<directory>${project.basedir}/src/test/resources/fixtures</directory>
<targetPath>${project.build.directory}/jasmine/fixtures</targetPath>
</resource>
- </resources>
+ </resources>
<plugins>
- <!-- run js tests with: $ mvn clean process-resources jasmine:test -->
<!--
- The Jasmine Maven plugin is now on version 1.3.1.0. It has several improvements,
- but we're unable to upgrade to it because of a change to the way it handles our
- fixtures. In 1.2 it serves target/fixtures at /fixtures. This no longer happens
- in 1.3.1. Ideally, the plugin would have a configuration option to include other
- directories for Jetty to serve. If this were added we would also be able to use
- mvn jasmine:bdd.
+ run js tests with: $ mvn clean process-resources jasmine:test
+ run tests in the browser with: $ mvn jasmine:bdd
-->
<plugin>
<groupId>com.github.searls</groupId>
<artifactId>jasmine-maven-plugin</artifactId>
<version>${jasmine-maven-plugin.version}</version>
- <!-- avoid double phase executions https://github.com/searls/jasmine-maven-plugin/pull/54 -->
- <extensions>true</extensions>
<executions>
<execution>
<goals>
@@ -134,7 +127,9 @@
<configuration>
<!--Uses the require.js test spec-->
<specRunnerTemplate>REQUIRE_JS</specRunnerTemplate>
- <scriptLoaderPath>js/libs/require.js</scriptLoaderPath>
+ <preloadSources>
+ <source>js/libs/require.js</source>
+ </preloadSources>
<!--Sources-->
<jsSrcDir>${project.basedir}/src/main/webapp/assets</jsSrcDir>
@@ -142,8 +137,18 @@
<customRunnerConfiguration>
${project.basedir}/src/test/javascript/config.txt
</customRunnerConfiguration>
+
+ <additionalContexts>
+ <!-- If context roots start with a / the resource will be available on the server at //root. -->
+ <!-- It is an error for context roots to end with a /. -->
+ <context>
+ <contextRoot>fixtures</contextRoot>
+ <directory>${project.build.directory}/jasmine/fixtures</directory>
+ </context>
+ </additionalContexts>
</configuration>
</plugin>
+
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven-dependency-plugin.version}</version>
@@ -179,25 +184,25 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
- <configuration>
- <excludes combine.children="append">
- <exclude>**/src/main/webapp/assets/js/libs/*</exclude>
- <exclude>**/src/main/dev/info.txt</exclude>
- <exclude>**/src/main/dev/js/libs/*</exclude>
- <exclude>**/src/build/requirejs-maven-plugin/r.js</exclude>
- <exclude>**/src/test/javascript/config.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/src/main/webapp/assets/js/libs/*</exclude>
+ <exclude>**/src/main/dev/info.txt</exclude>
+ <exclude>**/src/main/dev/js/libs/*</exclude>
+ <exclude>**/src/build/requirejs-maven-plugin/r.js</exclude>
+ <exclude>**/src/test/javascript/config.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d2960e02/usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js b/usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js
index 9f6bd67..af25019 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js
@@ -26,7 +26,8 @@ define([
"text!tpl/app-add-wizard/deploy-location-row.html",
"text!tpl/app-add-wizard/deploy-location-option.html",
"text!tpl/apps/param.html",
- "text!tpl/apps/param-list.html"
+ "text!tpl/apps/param-list.html",
+ "bootstrap"
], function (_, $, Backbone, Location, EffectorModalHtml,
DeployLocationRowHtml, DeployLocationOptionHtml, ParamHtml, ParamListHtml) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d2960e02/usage/jsgui/src/test/javascript/specs/view/effector-invoke-spec.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/javascript/specs/view/effector-invoke-spec.js b/usage/jsgui/src/test/javascript/specs/view/effector-invoke-spec.js
index 65c0a2f..178aca6 100644
--- a/usage/jsgui/src/test/javascript/specs/view/effector-invoke-spec.js
+++ b/usage/jsgui/src/test/javascript/specs/view/effector-invoke-spec.js
@@ -26,11 +26,11 @@ define([
var entityFixture = new Entity.Collection
entityFixture.url = 'fixtures/entity.json'
- entityFixture.fetch({async:true})
+ entityFixture.fetch()
var locationsFixture = new Location.Collection
locationsFixture.url = 'fixtures/location-list.json'
- locationsFixture.fetch({async:true})
+ locationsFixture.fetch()
var modalView = new EffectorInvokeView({
tagName:"div",
[3/3] git commit: Merge PR #93 (on behalf of Sam Corbett)
Posted by ri...@apache.org.
Merge PR #93 (on behalf of Sam Corbett)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8030224f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8030224f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8030224f
Branch: refs/heads/master
Commit: 8030224f12cd0ee1fe8ad4539a1f012fdb76b962
Parents: 0489205 2505735
Author: Richard Downer <ri...@apache.org>
Authored: Thu Jul 24 18:00:59 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 24 18:00:59 2014 +0100
----------------------------------------------------------------------
pom.xml | 5 +-
usage/jsgui/pom.xml | 63 +++++++++++---------
.../webapp/assets/js/view/effector-invoke.js | 3 +-
.../src/test/javascript/specs/router-spec.js | 6 +-
.../specs/view/effector-invoke-spec.js | 4 +-
5 files changed, 42 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: jsgui: Speed two tests up by decreasing wait periods
Posted by ri...@apache.org.
jsgui: Speed two tests up by decreasing wait periods
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/25057352
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/25057352
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/25057352
Branch: refs/heads/master
Commit: 250573526698ac774595d82ab8a2daa1ea5a88bb
Parents: d2960e0
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Jul 24 13:18:53 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Jul 24 17:59:26 2014 +0100
----------------------------------------------------------------------
usage/jsgui/src/test/javascript/specs/router-spec.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/25057352/usage/jsgui/src/test/javascript/specs/router-spec.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/javascript/specs/router-spec.js b/usage/jsgui/src/test/javascript/specs/router-spec.js
index 3d946d3..ea39255 100644
--- a/usage/jsgui/src/test/javascript/specs/router-spec.js
+++ b/usage/jsgui/src/test/javascript/specs/router-spec.js
@@ -67,7 +67,7 @@ define([
this.counter = 0;
this.callPeriodically("test-callback", function() {
this.counter += 1;
- }, 100)
+ }, 3)
}
});
@@ -75,7 +75,7 @@ define([
it("should have 'this' set to the owning view", function() {
Brooklyn.refresh = true;
var view = new CallbackView();
- waits(500);
+ waits(15);
runs(function() {
expect(view.counter).toBeGreaterThan(0);
});
@@ -84,7 +84,7 @@ define([
it("should not be run if Brooklyn.refresh is false", function() {
Brooklyn.refresh = false;
var view = new CallbackView();
- waits(500);
+ waits(15);
runs(function() {
expect(view.counter).toEqual(0);
Brooklyn.refresh = true;