Merge branch 'rc'

Author: GoCD User

README.md

@@ -347,3 +347,6 @@ To target a specific database set ENV_MONGO_URI.
 If your db is not running locally you have to pass `-Dallow.remote.cleanup=true`  
 
 
+# Problems
+
+* nodename nor servname provided, or not known - when running `test` - run: `echo "127.0.0.1 HOSTNAME" | sudo tee -a /etc/hosts` - where HOSTNAME is the host name in the error

conf/application-logger.xml

@@ -8,12 +8,13 @@
         </encoder>
     </appender>
 
-    <logger name="bootstrap" level="TRACE"/>
+    <logger name="bootstrap" level="INFO"/>
     <logger name="ch.qos.logback" level="WARN"/>
     <logger name="filters" level="TRACE"/>
     <logger name="org.corespring.assets.DoubleKeyCheckS3Service" level="DEBUG"/>
     <logger name="org.corespring.assets.EncodedKeyS3Client" level="TRACE"/>
     <logger name="org.corespring.itemSearch.ContentIndexHelper" level="TRACE"/>
+    <logger name="org.corespring.itemSearch" level="TRACE"/>
     <logger name="org.corespring.services.salat.ServicesContext" level="OFF"/>
     <logger name="org.corespring.v2.api.ItemApi" level="TRACE"/>
     <logger name="org.corespring.v2.api.services.CachingPlayerDefinitionService" level="TRACE"/>

corespring-components

@@ -10,13 +10,7 @@
   <logger name="ch.qos.logback" level="WARN"/>
   <logger name="org.corespring.it.helpers" level="DEBUG"/>
   <logger name="org.corespring.it.IntegrationSpecification" level="DEBUG"/>
-  <logger name="org.corespring.v2.api.ItemApi" level="TRACE" />
-  <logger name="org.corespring.v2.api.CollectionApiIntegrationTest" level="TRACE"/>
-  <logger name="org.corespring.it.ItemIndexCleaner" level="TRACE"/>
-  <logger name="org.corespring.itemSearch.ItemSearchIntegrationTest" level="TRACE"/>
-  <logger name="org.corespring.itemSearch.ElasticSearchItemIndexService" level="TRACE"/>
-  <logger name="org.corespring.elasticsearch.ContentDenormalizer" level="TRACE"/>
-  <logger name="bootstrap.ItemIndexingDao" level="TRACE"/>
+  <logger name="org.corespring.it.ItemIndexCleaner" level="DEBUG"/>
   <root level="WARN">
     <appender-ref ref="STDOUT" />
   </root>

it-resources/application-logger.xml

@@ -3,6 +3,7 @@ package org.corespring.v2.api
 import javax.transaction.Transaction
 
 import bootstrap.Main
+import com.mongodb.casbah.commons.MongoDBObject
 import org.bson.types.ObjectId
 import org.corespring.it.contexts.OrgWithAccessToken
 import org.corespring.it.{ IntegrationSpecification, ItemIndexCleaner }
@@ -124,6 +125,63 @@ class V2ItemApiSearchIntegrationTest extends IntegrationSpecification {
     }
   }
 
+  "search - metadata" should {
+
+    def mkMetadata() = new Fixture[OrgWithAccessToken] with ItemIndexCleaner {
+      def apply[R: AsResult](f: OrgWithAccessToken => R) = {
+
+        cleanIndex()
+        removeData()
+
+        val ctx: OrgWithAccessToken = OrgWithAccessToken.apply
+        val collectionId = CollectionHelper.create(ctx.org.id)
+
+        def addItem(index: Int) = {
+          val taskInfo = TaskInfo(
+            title = Some(s"Item index $index"),
+            extended = Map(
+              "progresstesting" -> MongoDBObject(
+                "sourceId" -> index.toString),
+              "kds" -> MongoDBObject(
+                "sourceId" -> index.toString)))
+
+          val item = Item(collectionId = collectionId.toString, taskInfo = Some(taskInfo))
+          ItemHelper.create(collectionId, item)
+        }
+
+        (0 to 2).map(addItem)
+        val r = f(ctx)
+        cleanIndex()
+        removeData()
+        AsResult(r)
+      }
+    }
+
+    "returns 1 kds.sourceId -> 1" in mkMetadata() { ctx =>
+      lazy val call = Routes.search(Some("""{"kds.sourceId": "1"}"""))
+      lazy val request = ctx.tokenRequestBuilder.makeRequest(call, AnyContentAsEmpty)
+      lazy val result = route(request).get
+      lazy val json = contentAsJson(result)
+      (json \ "total").as[Int] must_== 1
+    }
+
+    "returns 1 progresstesting.sourceId -> 1" in mkMetadata() { ctx =>
+      lazy val call = Routes.search(Some("""{"progresstesting.sourceId": "1"}"""))
+      lazy val request = ctx.tokenRequestBuilder.makeRequest(call, AnyContentAsEmpty)
+      lazy val result = route(request).get
+      lazy val json = contentAsJson(result)
+      (json \ "total").as[Int] must_== 1
+    }
+
+    "returns 0 progresstesting.sourceId -> 5" in mkMetadata() { ctx =>
+      lazy val call = Routes.search(Some("""{"progresstesting.sourceId": "5"}"""))
+      lazy val request = ctx.tokenRequestBuilder.makeRequest(call, AnyContentAsEmpty)
+      lazy val result = route(request).get
+      lazy val json = contentAsJson(result)
+      (json \ "total").as[Int] must_== 0
+    }
+  }
+
   "search - large dataset" should {
 
     def largeSet(publishOdd: Boolean) = new Fixture[OrgWithAccessToken] with ItemIndexCleaner {

it/org/corespring/v2/api/V2ItemApiSearchIntegrationTest.scala

@@ -1,2 +1,6 @@
+<<<<<<< Updated upstream
+=======
 TEST-*
 all_*
+>>>>>>> Stashed changes
+node_modules

js-test-runner

@@ -0,0 +1,35 @@
+module.exports = function (config) {
+  config.set({
+    basePath: '..',
+    frameworks: ['jasmine'],
+    files: [
+      'js-test/node_modules/jquery/dist/jquery.js',
+      'js-test/lib/js-diff.js',
+      'js-test/lib/jasmine-jquery.js',
+      'public/js/vendor/ace/ace.js',
+      'public/js/vendor/ace/theme-eclipse.js',
+      'public/js/vendor/ace/mode-xml.js',
+      'public/js/vendor/angular/1.0.1/angular-1.0.1.js',
+      'public/js/vendor/angular/1.0.1/angular-resource-1.0.1.js',
+      'public/js/vendor/angular/1.0.1/angular-mocks-1.0.1.js',
+      'public/js/vendor/underscore/1.3.3/underscore.js',
+      'public/js/vendor/angular-bootstrap-ui/angular-bootstrap-ui.js',
+      'public/js/vendor/corespring-ng-components/corespring-ng-components.js',
+      'public/js/corespring/qti/services/qtiServices.js',
+      'public/js/corespring/**/*.js',
+      'js-test/lib/play.mock.routes.js',
+      'js-test/unit/corespring/common/**/*.js',
+      'js-test/unit/corespring/lti-chooser/**/*.js',
+      'js-test/unit/corespring/tagger/**/*.js'
+    ],
+    exclude: ["public/js/corespring/qti/directives/printing/*.js",
+      "public/js/corespring/qti/directives/aggregate/*.js",
+      "public/js/corespring/qti/directives/instructor/*.js"],
+    browsers: ['PhantomJS'],
+
+    phantomjsLauncher: {
+      // Have phantomjs exit if a ResourceError is encountered (useful if karma exits without killing phantom) 
+      exitOnResourceError: false
+    }
+  })
+}