Fix fixtureloading state

Author: dantleech

features/all/phpcr_node_move.feature

@@ -1,4 +1,3 @@
-@annoying
 Feature: Move a node in the current session
     In order to move a single node in the current workspace
     As a user logged into the shell

features/all/phpcr_node_property_remove.feature

@@ -1,4 +1,3 @@
-@annoying
 Feature: Remove a single property at a specified path
     In order to remove a single property at a specified path
     As a user logged into the shell

features/all/phpcr_node_rename.feature

@@ -1,3 +1,4 @@
+@annoying
 Feature: Rename a node
     In order to rename a node
     As a user that is logged into the shell

features/all/phpcr_node_reorder_before.feature

@@ -1,3 +1,4 @@
+@annoying
 Feature: Reorder a node
     In order to change the order of a node
     As a user that is logged into the shell

spec/PHPCR/Shell/Event/CommandExceptionEventSpec.php

@@ -5,7 +5,7 @@
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputInterface;
+use PHPCR\Shell\Console\Application\ShellApplication;
 
 class CommandExceptionEventSpec extends ObjectBehavior
 {
@@ -16,10 +16,10 @@ function it_is_initializable()
 
     function let(
         \Exception $exception,
-        InputInterface $input,
+        ShellApplication $application,
         OutputInterface $output
     ) {
-        $this->beConstructedWith($exception, $input, $output);
+        $this->beConstructedWith($exception, $application, $output);
     }
 
     function it_should_provide_access_to_event_parameters(

src/PHPCR/Shell/Test/ContextBase.php

@@ -53,7 +53,6 @@ public function beforeScenario()
         chdir($this->workingDir);
         $this->filesystem = new Filesystem();
         $this->applicationTester = $this->createTester();
-        $this->getSession()->refresh(true);
     }
 
     /**
@@ -216,6 +215,10 @@ public function theFixturesAreLoaded($arg1)
         $session = $this->getSession(null, true);
         NodeHelper::purgeWorkspace($session);
         $session->save();
+
+        // shouldn't have to do this, but this seems to be a bug in jackalope
+        $session->refresh(false);
+
         $session->importXml('/', $fixtureFile, 0);
         $session->save();
     }