Permalink
Browse files

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

  • Loading branch information...
2 parents 7737e24 + 6bbae17 commit f4d1a33422617e7d5613411a5de997365fbcbc19 @drewbourne drewbourne committed Nov 3, 2011
View
@@ -5,4 +5,4 @@ if `uname`.strip == 'Darwin' and ENV["rvm_ruby_string"] != 'system'
end
gem "rjb", "1.3.3"
-gem "buildr-as3", "0.2.28.pre"
+gem "buildr-as3", "0.2.29.pre"
View
@@ -0,0 +1,29 @@
+#!/bin/bash
+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
+
+ERRORLEVEL=$?
+if [ $ERRORLEVEL -eq 0 ]
+then
+ echo
+ echo ----------------------INSTRUCTIONS----------------------
+ echo Compiled, now running...
+ echo Type \"continue\" - no quotes - followed by return to start
+ echo Note: May need to entry \"continue\" command twice
+ echo Type \"quit\" - no quotes - followed by return key to exit
+ echo
+ echo Note: These tests require FlashPlayer 10.1
+ echo
+ fdb bin/Robotlegs2Runner.swf
+else
+ echo
+ echo -------------------INSTRUCTIONS-------------------
+ if [ $ERRORLEVEL -eq 1 ]
+ then
+ echo Found $ERRORLEVEL error during compilation
+ else
+ echo Found $ERRORLEVEL errors during compilation
+ fi
+ echo Fix the errors indicated above then try this again.
+ echo
+ echo
+fi
View
@@ -1,5 +1,5 @@
require "fileutils"
-require "buildr/as3" # needs buildr-as3 v0.2.28.pre
+require "buildr/as3" # needs buildr-as3 v0.2.29.pre
# You can use bundler to install the correct buildr gem: bundle install
# Then you can run buildr isolated: bundle exec buildr [tasks] ...
@@ -12,6 +12,6 @@ package org.robotlegs.v2.extensions.guardsAndHooks.api
public interface IHooksProcessor
{
- function runHooks(useInjector:Injector, guardClasses:Vector.<Class>):void;
+ function runHooks(useInjector:Injector, hookClasses:Vector.<Class>):void;
}
}
@@ -12,7 +12,6 @@ package org.robotlegs.v2.extensions.mediatorMap
import flash.events.Event;
import mockolate.received;
import mockolate.runner.MockolateRule;
- import mockolate.runner.MockolateRunner;
import org.flexunit.asserts.*;
import org.hamcrest.assertThat;
import org.robotlegs.v2.extensions.guardsAndHooks.impl.GuardsProcessor;
@@ -26,10 +25,6 @@ package org.robotlegs.v2.extensions.mediatorMap
import org.robotlegs.v2.extensions.eventMap.api.IEventMap;
import flash.events.IEventDispatcher;
- // required
- MockolateRunner;
-
- [RunWith("mockolate.runner.MockolateRunner")]
public class MediatorMapRemovalAndReparentingTests
{
@@ -24,10 +24,6 @@ package org.robotlegs.v2.extensions.mediatorMap.impl
import flash.events.Event;
import org.flexunit.async.Async;
- // required
- MockolateRunner;
-
- [RunWith("mockolate.runner.MockolateRunner")]
public class MediatorSugarTest
{
[Rule]
@@ -26,10 +26,6 @@ package org.robotlegs.v2.extensions.mediatorMap.impl
import org.robotlegs.v2.extensions.eventMap.api.IEventMap;
import flash.display.DisplayObject;
- // required
- MockolateRunner;
-
- [RunWith("mockolate.runner.MockolateRunner")]
public class MediatorTest
{
[Rule]
@@ -18,10 +18,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
import org.robotlegs.v2.extensions.mediatorMap.api.IMediator;
import flash.errors.IllegalOperationError;
- // required
- MockolateRunner;
-
- [RunWith("mockolate.runner.MockolateRunner")]
public class DuckTypedMediatorTriggerTest
{
@@ -28,10 +28,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.support.DuckTypedRL2Mediator;
import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.support.RL1Mediator;
- // required
- MockolateRunner;
-
- [RunWith("mockolate.runner.MockolateRunner")]
public class DuckTypedMediatorTrigger_strategiesTest
{
@@ -20,10 +20,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.support.DuckTypedRL1Mediator;
import org.robotlegs.v2.extensions.mediatorMap.api.IMediator;
- // required
- MockolateRunner;
-
- [RunWith("mockolate.runner.MockolateRunner")]
public class RL1AndRL2MediatorTriggerTest
{
@@ -28,10 +28,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
import org.robotlegs.v2.extensions.mediatorMap.utilities.strategies.WaitForCreationCompleteStrategy;
import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.RL1AndRL2MediatorTrigger;
- // required
- MockolateRunner;
-
- [RunWith("mockolate.runner.MockolateRunner")]
public class RL1AndRL2MediatorTrigger_strategiesTest
{
@@ -18,10 +18,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
import org.robotlegs.core.IMediator;
import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.support.DuckTypedRL1Mediator;
- // required
- MockolateRunner;
-
- [RunWith("mockolate.runner.MockolateRunner")]
public class RL1MediatorTriggerTest
{
@@ -20,10 +20,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
import org.robotlegs.v2.extensions.mediatorMap.api.IMediator;
import org.robotlegs.v2.extensions.mediatorMap.utilities.triggers.support.DuckTypedRL2Mediator;
- // required
- MockolateRunner;
-
- [RunWith("mockolate.runner.MockolateRunner")]
public class RL2MediatorTriggerTest
{
@@ -27,10 +27,6 @@ package org.robotlegs.v2.extensions.mediatorMap.utilities.triggers
import flash.display.MovieClip;
import org.robotlegs.v2.extensions.mediatorMap.utilities.strategies.WaitForCreationCompleteStrategy;
- // required
- MockolateRunner;
-
- [RunWith("mockolate.runner.MockolateRunner")]
public class RL2MediatorTrigger_strategiesTest
{

0 comments on commit f4d1a33

Please sign in to comment.