Merges with develop.

Author: ryasmi

.travis.yml

@@ -17,6 +17,7 @@ before_script:
   - php artisan migrate --env="testing"
 
 script: ./vendor/bin/phpunit
+after_success: sh test.sh
 
 notifications:
   slack:

VERSION

@@ -1 +1 @@
-1.5.3
+1.6.0

app/config/local/app.php

@@ -5,5 +5,5 @@
     'Jenssegers\Mongodb\Auth\ReminderServiceProvider',
    )),
 
-  'debug' => false,
+  'debug' => true,
 );

app/locker/data/dashboards/AdminDashboard.php

@@ -58,13 +58,12 @@ public function lrsCount(){
    *
    **/
   public function actorCount(){
-
     $mbox =  intval( \Statement::distinct('statement.actor.mbox')->remember(5)->count() );
     $openid =  intval( \Statement::distinct('statement.actor.openid')->remember(5)->count() );
     $mbox_sha1sum =  intval( \Statement::distinct('statement.actor.mbox_sha1sum')->remember(5)->count() );
     $account =  intval( \Statement::distinct('statement.actor.account.name')->remember(5)->count() );
-     return ($mbox + $openid + $mbox_sha1sum + $account);
-   }
+    return ($mbox + $openid + $mbox_sha1sum + $account);
+  }
 
   /**
    * Count the number of users in Learning Locker.

app/locker/repository/Query/EloquentQueryRepository.php

@@ -84,12 +84,14 @@ public function aggregate(array $opts, array $pipeline) {
     ];
 
     $cache_key = sha1(json_encode($pipeline));
-    $result = IlluminateCache::get($cache_key, function() use ($pipeline, $cache_key) {
+    $create_cache = function () use ($pipeline, $cache_key) {
       $expiration = Carbon::now()->addMinutes(10);
       $result = Helpers::replaceHtmlEntity($this->db->statements->aggregate($pipeline), true);
       IlluminateCache::put($cache_key, $result, $expiration);
       return $result;
-    });
+    };
+    //$result = IlluminateCache::get($cache_key, $create_cache);
+    $result = $create_cache();
 
     return $result;
   }

test.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env sh
+
+DEVELOP="develop"
+
+if [ "${DEVELOP}" = "${TRAVIS_BRANCH}" ]; then
+  echo "Running conformance tests."
+
+  # Starts the server.
+  sudo chmod -R 777 *
+  php artisan serve --env=testing --host 0.0.0.0 --port=8000 &
+
+  # Creates a new User.
+  mongo ll_staging --eval 'db.users.insert({"name" : "Test User", "email" : "[email protected]", "verified" : "yes", "role" : "super", "password" : "$2y$10$MKDC2thihULF3fNuVj.DyORidVd.airmxZicEcSrpNQRsJMX3ZGBW"})'
+
+  # Creates a new LRS.
+  mongo ll_staging --eval 'db.lrs.insert({"title" : "Conformance", "description" : "",  "owner" : { "_id" : db.users.find()[0]._id}})'
+
+  # Creates a new Client.
+  mongo ll_staging --eval 'db.client.insert({"api" : { "basic_key" : "1484c2ac05269b8c5479a1dd6a0d6370991fd6a1", "basic_secret" : "f0ef3d8062805c0fc1675beb8ac0715c75df13cb" }, "lrs_id" : db.lrs.find()[0]._id, "authority" : { "name" : "New Client", "mbox" : "mailto:[email protected]" }, "scopes" : [ "all" ]})'
+
+  # Runs the test suite.
+  git clone https://github.com/ryansmith94/xAPI_LRS_Test.git conformance > /dev/null
+  cd conformance
+  git checkout travis > /dev/null
+  cd src
+  npm install -g grunt-cli > /dev/null
+  npm install > /dev/null
+  grunt --bail --reporter=dot --endpoint="http://0.0.0.0:8000/data/xAPI/" --username="1484c2ac05269b8c5479a1dd6a0d6370991fd6a1" --password="f0ef3d8062805c0fc1675beb8ac0715c75df13cb" --xapi-version="1.0.1"
+
+  # Stops the server.
+  ps aux | grep [p]hp | awk '{print $2}' | xargs kill
+  echo "Stopped the server."
+
+  echo "Completed conformance tests."
+else
+  echo "Not running conformance tests."
+fi