Merge branch 'develop' into feature/#216-infobox

.docker/api/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8.9.0
+FROM node:8.11.1
 
 WORKDIR /usr/src/app
 

.travis.yml

@@ -78,7 +78,7 @@ script:
   - npm run e2e         # run end-to-end-tests
   - sed -i 's/$TRAVIS_COMMIT/'$TRAVIS_COMMIT'/' src/app/shared/services/raven-error-handler.service.ts
   - cd ../..
-  - .travis/build-fe.sh       # build in prod mode
+  - travis_wait 30 .travis/build-fe.sh       # build in prod mode
 
 after_script:
   # send required files to coveralls.io

.travis/apidoc.sh

@@ -45,7 +45,7 @@ if [[ "$TRAVIS_BRANCH" == "master" ]] || [[ -n "$TRAVIS_TAG" ]]; then
     git commit -m "Travis build: $TRAVIS_BUILD_NUMBER" &>/dev/null
 
     if [[ -n "$TRAVIS_TAG" ]]; then
-        echo "+ git tag" ; git tag $TRAVIS_TAG
+        echo "+ git tag" ; git tag -a $TRAVIS_TAG -m "Release $TRAVIS_TAG"
     else
         echo -e "${YELLOW}+ skipping: git tag - not tagged build${NC}"
     fi

api/fixtures/FixtureLoader.ts

@@ -23,7 +23,7 @@ export class FixtureLoader {
     (<any>mongoose).Promise = global.Promise;
 
     if (!mongoose.connection.readyState) {
-      mongoose.connect(config.database, {useMongoClient: true});
+      mongoose.connect(config.database);
     }
   }
 
@@ -78,7 +78,7 @@ export class FixtureLoader {
 
       for (const file of files) {
         if (!fs.existsSync(file.path) && fs.existsSync(this.binaryDirectory + file.alias)) {
-          fs.copyFileSync(this.binaryDirectory + file.alias, file.path)
+          fs.copyFileSync(this.binaryDirectory + file.alias, file.path);
         }
       }
     }));

api/fixtures/FixtureUtils.ts

@@ -71,7 +71,7 @@ export class FixtureUtils {
         lastName: stud.profile.lastName,
         uid: stud.uid,
         courseId: new ObjectId(course._id)
-      }
+      };
     });
   }
 
@@ -175,7 +175,7 @@ export class FixtureUtils {
       const shuffeledArray = this.shuffleArray(array);
       const count = this.getRandomNumber(min, max);
       const start = this.getRandomNumber(0, shuffeledArray.length - count);
-      return shuffeledArray.slice(start, start + count)
+      return shuffeledArray.slice(start, start + count);
     }
   }
 

api/fixtures/courses/Access-key-test.json

@@ -0,0 +1,23 @@
+{
+  "name": "Access key test",
+  "description": "This course is used to test the access key course enroll type.",
+  "active": true,
+  "whitelist": [],
+  "enrollType": "accesskey",
+  "accessKey": "accessKey1234",
+  "hasAccessKey": true,
+  "lectures": [
+    {
+      "name": "Documentation",
+      "description": "Documents the course fixture.",
+      "units": [
+        {
+          "name": "What is course fixture for?",
+          "description": "",
+          "markdown": "To test the 'accesskey' enrollType.",
+          "__t": "free-text"
+        }
+      ]
+    }
+  ]
+}