Skip to content
This repository
Browse code

Merge remote-tracking branch 'robotlegs/version2' into version2

  • Loading branch information...
commit f4d1a33422617e7d5613411a5de997365fbcbc19 2 parents 7737e24 + 6bbae17
Drew Bourne authored November 03, 2011
2  Gemfile
@@ -5,4 +5,4 @@ if `uname`.strip == 'Darwin' and ENV["rvm_ruby_string"] != 'system'
5 5
 end
6 6
 
7 7
 gem "rjb", "1.3.3"
8  
-gem "buildr-as3", "0.2.28.pre"
  8
+gem "buildr-as3", "0.2.29.pre"
29  build.sh
... ...
@@ -0,0 +1,29 @@
  1
+#!/bin/bash
  2
+mxmlc -debug -default-background-color=#FFFFFF -default-frame-rate=24 -default-size 900 550 -library-path+=lib/hamcrest-as3-flex-1.1.3.swc -library-path+=lib/robotlegs-framework-v1.5.2.swc -library-path+=lib/SwiftSuspenders-v2.0.0b1.swc -library-path+=lib/as3commons-logging-2.7.swc -library-path+=lib/mockolate-0.12.2-flex.swc -library-path+=lib/flexunit-4.1.0-8-flex_4.1.0.16076.swc -library-path+=lib/flexunit-cilistener-4.1.0-8-4.1.0.16076.swc -library-path+=lib/fluint-extensions-4.1.0-8-4.1.0.16076.swc -output=bin/Robotlegs2Runner.swf -source-path+=src -source-path+=test -verbose-stacktraces=true -warnings=true test/RobotlegsTest.mxml
  3
+
  4
+ERRORLEVEL=$?
  5
+if [ $ERRORLEVEL -eq 0 ]
  6
+then
  7
+  echo
  8
+  echo ----------------------INSTRUCTIONS----------------------
  9
+  echo Compiled, now running...
  10
+  echo Type \"continue\" - no quotes - followed by return to start
  11
+  echo   Note: May need to entry \"continue\" command twice
  12
+  echo Type \"quit\" - no quotes - followed by return key to exit
  13
+  echo
  14
+  echo Note: These tests require FlashPlayer 10.1
  15
+  echo
  16
+  fdb bin/Robotlegs2Runner.swf
  17
+else
  18
+  echo
  19
+  echo -------------------INSTRUCTIONS-------------------
  20
+  if [ $ERRORLEVEL -eq 1 ]
  21
+  then
  22
+    echo Found $ERRORLEVEL error during compilation
  23
+  else
  24
+    echo Found $ERRORLEVEL errors during compilation
  25
+  fi
  26
+  echo Fix the errors indicated above then try this again.
  27
+  echo
  28
+  echo
  29
+fi
2  buildfile
... ...
@@ -1,5 +1,5 @@
1 1
 require "fileutils"
2  
-require "buildr/as3" # needs buildr-as3 v0.2.28.pre
  2
+require "buildr/as3" # needs buildr-as3 v0.2.29.pre
3 3
 
4 4
 # You can use bundler to install the correct buildr gem: bundle install
5 5
 # Then you can run buildr isolated: bundle exec buildr [tasks] ...
2  src/org/robotlegs/v2/extensions/guardsAndHooks/api/IHooksProcessor.as
@@ -12,6 +12,6 @@ package org.robotlegs.v2.extensions.guardsAndHooks.api
12 12
 	public interface IHooksProcessor
13 13
 	{
14 14
 		
15  
-		function runHooks(useInjector:Injector, guardClasses:Vector.<Class>):void;
  15
+		function runHooks(useInjector:Injector, hookClasses:Vector.<Class>):void;
16 16
 	}
17 17
 }
5  test/org/robotlegs/v2/extensions/mediatorMap/MediatorMapRemovalAndReparentingTests.as
@@ -12,7 +12,6 @@ package org.robotlegs.v2.extensions.mediatorMap
12 12
 	import flash.events.Event;
13 13
 	import mockolate.received;
14 14
 	import mockolate.runner.MockolateRule;
15  
-	import mockolate.runner.MockolateRunner;
16 15
 	import org.flexunit.asserts.*;
17 16
 	import org.hamcrest.assertThat;
18 17
 	import org.robotlegs.v2.extensions.guardsAndHooks.impl.GuardsProcessor;
@@ -26,10 +25,6 @@ package org.robotlegs.v2.extensions.mediatorMap
26 25
 	import org.robotlegs.v2.extensions.eventMap.api.IEventMap;
27 26
 	import flash.events.IEventDispatcher;
28 27
 	
29  
-	// required
30  
-	MockolateRunner;
31  
-
32  
-	[RunWith("mockolate.runner.MockolateRunner")]
33 28
 	public class MediatorMapRemovalAndReparentingTests
34 29
 	{
35 30
 
4  test/org/robotlegs/v2/extensions/mediatorMap/impl/MediatorSugarTest.as
@@ -24,10 +24,6 @@ package org.robotlegs.v2.extensions.mediatorMap.impl
24 24
 	import flash.events.Event;
25 25
 	import org.flexunit.async.Async;
26 26
 	
27  
-	// required
28  
-	MockolateRunner;
29  
-
30  
-	[RunWith("mockolate.runner.MockolateRunner")]
31 27
 	public class MediatorSugarTest
32 28
 	{
33 29
 		[Rule]
4  test/org/robotlegs/v2/extensions/mediatorMap/impl/MediatorTest.as
@@ -26,10 +26,6 @@ package org.robotlegs.v2.extensions.mediatorMap.impl
26 26
 	import org.robotlegs.v2.extensions.eventMap.api.IEventMap;
27 27
 	import flash.display.DisplayObject;
28 28
 	
29  
-	// required
30  
-	MockolateRunner;
31  
-
32  
-	[RunWith("mockolate.runner.MockolateRunner")]
33 29
 	public class MediatorTest
34 30
 	{
35 31
 		[Rule]
4  test/org/robotlegs/v2/extensions/mediatorMap/utilities/triggers/DuckTypedMediatorTriggerTest.as
@@ -18,10 +18,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
18 18
 	import org.robotlegs.v2.extensions.mediatorMap.api.IMediator;
19 19
 	import flash.errors.IllegalOperationError;
20 20
 
21  
-	// required
22  
-	MockolateRunner;
23  
-
24  
-	[RunWith("mockolate.runner.MockolateRunner")]
25 21
 	public class DuckTypedMediatorTriggerTest
26 22
 	{
27 23
 
4  test/org/robotlegs/v2/extensions/mediatorMap/utilities/triggers/DuckTypedMediatorTrigger_strategiesTest.as
@@ -28,10 +28,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
28 28
 	import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.support.DuckTypedRL2Mediator;
29 29
 	import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.support.RL1Mediator;
30 30
 
31  
-	// required
32  
-	MockolateRunner;
33  
-
34  
-	[RunWith("mockolate.runner.MockolateRunner")]
35 31
 	public class DuckTypedMediatorTrigger_strategiesTest
36 32
 	{
37 33
 
4  test/org/robotlegs/v2/extensions/mediatorMap/utilities/triggers/RL1AndRL2MediatorTriggerTest.as
@@ -20,10 +20,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
20 20
 	import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.support.DuckTypedRL1Mediator;
21 21
 	import org.robotlegs.v2.extensions.mediatorMap.api.IMediator;
22 22
 
23  
-	// required
24  
-	MockolateRunner;
25  
-
26  
-	[RunWith("mockolate.runner.MockolateRunner")]
27 23
 	public class RL1AndRL2MediatorTriggerTest
28 24
 	{
29 25
 
4  test/org/robotlegs/v2/extensions/mediatorMap/utilities/triggers/RL1AndRL2MediatorTrigger_strategiesTest.as
@@ -28,10 +28,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
28 28
 	import org.robotlegs.v2.extensions.mediatorMap.utilities.strategies.WaitForCreationCompleteStrategy;
29 29
 	import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.RL1AndRL2MediatorTrigger;
30 30
 
31  
-	// required
32  
-	MockolateRunner;
33  
-
34  
-	[RunWith("mockolate.runner.MockolateRunner")]
35 31
 	public class RL1AndRL2MediatorTrigger_strategiesTest
36 32
 	{
37 33
 
4  test/org/robotlegs/v2/extensions/mediatorMap/utilities/triggers/RL1MediatorTriggerTest.as
@@ -18,10 +18,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
18 18
 	import org.robotlegs.core.IMediator;
19 19
 	import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.support.DuckTypedRL1Mediator;
20 20
 
21  
-	// required
22  
-	MockolateRunner;
23  
-
24  
-	[RunWith("mockolate.runner.MockolateRunner")]
25 21
 	public class RL1MediatorTriggerTest
26 22
 	{
27 23
 
4  test/org/robotlegs/v2/extensions/mediatorMap/utilities/triggers/RL2MediatorTriggerTest.as
@@ -20,10 +20,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
20 20
 	import org.robotlegs.v2.extensions.mediatorMap.api.IMediator;
21 21
 	import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.support.DuckTypedRL2Mediator;
22 22
 
23  
-	// required
24  
-	MockolateRunner;
25  
-
26  
-	[RunWith("mockolate.runner.MockolateRunner")]
27 23
 	public class RL2MediatorTriggerTest
28 24
 	{
29 25
 
4  test/org/robotlegs/v2/extensions/mediatorMap/utilities/triggers/RL2MediatorTrigger_strategiesTest.as
@@ -27,10 +27,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
27 27
 	import flash.display.MovieClip;
28 28
 	import org.robotlegs.v2.extensions.mediatorMap.utilities.strategies.WaitForCreationCompleteStrategy;
29 29
 
30  
-	// required
31  
-	MockolateRunner;
32  
-
33  
-	[RunWith("mockolate.runner.MockolateRunner")]
34 30
 	public class RL2MediatorTrigger_strategiesTest
35 31
 	{
36 32
 

0 notes on commit f4d1a33

Please sign in to comment.
Something went wrong with that request. Please try again.