- @row = options.row
- @column = options.column
+ constructor: (@markerId, @range, options) ->
@word = options.word
@suggestions = options.suggestions
class HighlightedWordManager
constructor: (@editor) ->
@reset()
-
- reset: () ->
- @highlights = rows: []
- addHighlight: (highlight) ->
- unless highlight instanceof Highlight
- highlight = new Highlight(highlight)
- range = new Range(
- highlight.row, highlight.column,
- highlight.row, highlight.column + highlight.word.length
- )
- highlight.markerId = @editor.getSession().addMarker range, "spelling-highlight", 'text', false
- @highlights.rows[highlight.row] ||= []
- @highlights.rows[highlight.row].push highlight
+ reset: () ->
+ @highlights?.forEach (highlight) =>
+ @editor.getSession().removeMarker(highlight.markerId)
+ @highlights = []
+
+ addHighlight: (options) ->
+ session = @editor.getSession()
+ doc = session.getDocument()
+ # Set up Range that will automatically update it's positions when the
+ # document changes
+ range = new Range()
+ range.start = doc.createAnchor({
+ row: options.row,
+ column: options.column
+ })
+ range.end = doc.createAnchor({
+ row: options.row,
+ column: options.column + options.word.length
+ })
+ # Prevent range from adding newly typed characters to the end of the word.
+ # This makes it appear as if the spelling error continues to the next word
+ # even after a space
+ range.end.$insertRight = true
+
+ markerId = session.addMarker range, "spelling-highlight", 'text', false
+
+ @highlights.push new Highlight(markerId, range, options)
removeHighlight: (highlight) ->
@editor.getSession().removeMarker(highlight.markerId)
- for h, i in @highlights.rows[highlight.row]
- if h == highlight
- @highlights.rows[highlight.row].splice(i, 1)
+ @highlights = @highlights.filter (hl) ->
+ hl != highlight
removeWord: (word) ->
- toRemove = []
- for row in @highlights.rows
- for highlight in (row || [])
- if highlight.word == word
- toRemove.push(highlight)
- for highlight in toRemove
- @removeHighlight highlight
+ @highlights.filter (highlight) ->
+ highlight.word == word
+ .forEach (highlight) =>
+ @removeHighlight(highlight)
- moveHighlight: (highlight, position) ->
- @removeHighlight highlight
- highlight.row = position.row
- highlight.column = position.column
- @addHighlight highlight
-
- clearRows: (from, to) ->
- from ||= 0
- to ||= @highlights.rows.length - 1
- for row in @highlights.rows.slice(from, to + 1)
- for highlight in (row || []).slice(0)
- @removeHighlight highlight
-
- insertRows: (offset, number) ->
- # rows are inserted after offset. i.e. offset row is not modified
- affectedHighlights = []
- for row in @highlights.rows.slice(offset)
- affectedHighlights.push(highlight) for highlight in (row || [])
- for highlight in affectedHighlights
- @moveHighlight highlight,
- row: highlight.row + number
- column: highlight.column
-
- removeRows: (offset, number) ->
- # offset is the first row to delete
- affectedHighlights = []
- for row in @highlights.rows.slice(offset)
- affectedHighlights.push(highlight) for highlight in (row || [])
- for highlight in affectedHighlights
- if highlight.row >= offset + number
- @moveHighlight highlight,
- row: highlight.row - number
- column: highlight.column
- else
- @removeHighlight highlight
+ clearRow: (row) ->
+ @highlights.filter (highlight) ->
+ highlight.range.start.row == row
+ .forEach (highlight) =>
+ @removeHighlight(highlight)
findHighlightWithinRange: (range) ->
- rows = @highlights.rows.slice(range.start.row, range.end.row + 1)
- for row in rows
- for highlight in (row || [])
- if @_doesHighlightOverlapRange(highlight, range.start, range.end)
- return highlight
- return null
-
- applyChange: (change) ->
- start = change.start
- end = change.end
- if change.action == "insert"
- if start.row != end.row
- rowsAdded = end.row - start.row
- @insertRows start.row + 1, rowsAdded
- # make a copy since we're going to modify in place
- oldHighlights = (@highlights.rows[start.row] || []).slice(0)
- for highlight in oldHighlights
- if highlight.column > start.column
- # insertion was fully before this highlight
- @moveHighlight highlight,
- row: end.row
- column: highlight.column + (end.column - start.column)
- else if highlight.column + highlight.word.length >= start.column
- # insertion was inside this highlight
- @removeHighlight highlight
-
- else if change.action == "remove"
- if start.row == end.row
- oldHighlights = (@highlights.rows[start.row] || []).slice(0)
- else
- rowsRemoved = end.row - start.row
- oldHighlights =
- (@highlights.rows[start.row] || []).concat(
- (@highlights.rows[end.row] || [])
- )
- @removeRows start.row + 1, rowsRemoved
-
- for highlight in oldHighlights
- if @_doesHighlightOverlapRange highlight, start, end
- @removeHighlight highlight
- else if @_isHighlightAfterRange highlight, start, end
- @moveHighlight highlight,
- row: start.row
- column: highlight.column - (end.column - start.column)
+ _.find @highlights, (highlight) =>
+ @_doesHighlightOverlapRange highlight, range.start, range.end
_doesHighlightOverlapRange: (highlight, start, end) ->
+ highlightRow = highlight.range.start.row
+ highlightStartColumn = highlight.range.start.column
+ highlightEndColumn = highlight.range.end.column
+
highlightIsAllBeforeRange =
- highlight.row < start.row or
- (highlight.row == start.row and highlight.column + highlight.word.length <= start.column)
+ highlightRow < start.row or
+ (highlightRow == start.row and highlightEndColumn <= start.column)
highlightIsAllAfterRange =
- highlight.row > end.row or
- (highlight.row == end.row and highlight.column >= end.column)
+ highlightRow > end.row or
+ (highlightRow == end.row and highlightStartColumn >= end.column)
!(highlightIsAllBeforeRange or highlightIsAllAfterRange)
- _isHighlightAfterRange: (highlight, start, end) ->
- return true if highlight.row > end.row
- return false if highlight.row < end.row
- highlight.column >= end.column
-
+ clearHighlightTouchingRange: (range) ->
+ highlight = _.find @highlights, (hl) =>
+ @_doesHighlightTouchRange hl, range.start, range.end
+ if highlight
+ @removeHighlight highlight
+ _doesHighlightTouchRange: (highlight, start, end) ->
+ highlightRow = highlight.range.start.row
+ highlightStartColumn = highlight.range.start.column
+ highlightEndColumn = highlight.range.end.column
-
-
-
+ rangeStartIsWithinHighlight =
+ highlightStartColumn <= start.column and
+ highlightEndColumn >= start.column
+ rangeEndIsWithinHighlight =
+ highlightStartColumn <= end.column and
+ highlightEndColumn >= end.column
+ highlightRow == start.row and
+ (rangeStartIsWithinHighlight or rangeEndIsWithinHighlight)
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckAdapter.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckAdapter.coffee
new file mode 100644
index 0000000000..2afc2cf0ff
--- /dev/null
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckAdapter.coffee
@@ -0,0 +1,56 @@
+define [
+ "ace/ace"
+ "ide/editor/directives/aceEditor/spell-check/HighlightedWordManager"
+], (Ace, HighlightedWordManager) ->
+ Range = ace.require('ace/range').Range
+
+ class SpellCheckAdapter
+ constructor: (@editor) ->
+ @highlightedWordManager = new HighlightedWordManager(@editor)
+
+ getLines: () ->
+ @editor.getValue().split('\n')
+
+ normalizeChangeEvent: (e) -> e
+
+ getCoordsFromContextMenuEvent: (e) ->
+ e.domEvent.stopPropagation()
+ return {
+ x: e.domEvent.clientX,
+ y: e.domEvent.clientY
+ }
+
+ preventContextMenuEventDefault: (e) ->
+ e.domEvent.preventDefault()
+
+ getHighlightFromCoords: (coords) ->
+ position = @editor.renderer.screenToTextCoordinates(coords.x, coords.y)
+ @highlightedWordManager.findHighlightWithinRange({
+ start: position
+ end: position
+ })
+
+ selectHighlightedWord: (highlight) ->
+ row = highlight.range.start.row
+ startColumn = highlight.range.start.column
+ endColumn = highlight.range.end.column
+
+ @editor.getSession().getSelection().setSelectionRange(
+ new Range(
+ row, startColumn,
+ row, endColumn
+ )
+ )
+
+ replaceWord: (highlight, newWord) =>
+ row = highlight.range.start.row
+ startColumn = highlight.range.start.column
+ endColumn = highlight.range.end.column
+
+ @editor.getSession().replace(new Range(
+ row, startColumn,
+ row, endColumn
+ ), newWord)
+
+ # Bring editor back into focus after clicking on suggestion
+ @editor.focus()
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee
index acbd636531..cbe4fdbd64 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee
@@ -1,129 +1,88 @@
-define [
- "ide/editor/directives/aceEditor/spell-check/HighlightedWordManager"
- "ace/ace"
-], (HighlightedWordManager) ->
- Range = ace.require("ace/range").Range
-
+define [], () ->
class SpellCheckManager
- constructor: (@$scope, @editor, @element, @cache, @$http, @$q) ->
- $(document.body).append @element.find(".spell-check-menu")
+ constructor: (@$scope, @cache, @$http, @$q, @adapter) ->
+ @$scope.spellMenu = {
+ open: false
+ top: '0px'
+ left: '0px'
+ suggestions: []
+ }
@inProgressRequest = null
@updatedLines = []
- @highlightedWordManager = new HighlightedWordManager(@editor)
- @$scope.$watch "spellCheckLanguage", (language, oldLanguage) =>
+ @$scope.$watch 'spellCheckLanguage', (language, oldLanguage) =>
if language != oldLanguage and oldLanguage?
@runFullCheck()
- onChange = (e) =>
- @runCheckOnChange(e)
-
- onScroll = () =>
- @closeContextMenu()
+ @$scope.replaceWord = @adapter.replaceWord
+ @$scope.learnWord = @learnWord
- @editor.on "changeSession", (e) =>
- @highlightedWordManager.reset()
- if @inProgressRequest?
- @inProgressRequest.abort()
-
- if @$scope.spellCheckEnabled and @$scope.spellCheckLanguage and @$scope.spellCheckLanguage != ""
- @runSpellCheckSoon(200)
-
- e.oldSession?.getDocument().off "change", onChange
- e.session.getDocument().on "change", onChange
-
- e.oldSession?.off "changeScrollTop", onScroll
- e.session.on "changeScrollTop", onScroll
-
- @$scope.spellingMenu = {left: '0px', top: '0px'}
-
- @editor.on "nativecontextmenu", (e) =>
- e.domEvent.stopPropagation();
- @closeContextMenu(e.domEvent)
- @openContextMenu(e.domEvent)
-
- $(document).on "click", (e) =>
- if e.which != 3 # Ignore if this was a right click
- @closeContextMenu(e)
+ $(document).on 'click', (e) =>
+ @closeContextMenu() if e.which != 3 # Ignore if right click
return true
- @$scope.replaceWord = (highlight, suggestion) =>
- @replaceWord(highlight, suggestion)
+ init: () ->
+ @updatedLines = Array(@adapter.getLines().length).fill(true)
+ @runSpellCheckSoon(200) if @isSpellCheckEnabled()
- @$scope.learnWord = (highlight) =>
- @learnWord(highlight)
+ isSpellCheckEnabled: () ->
+ return !!(
+ @$scope.spellCheck and
+ @$scope.spellCheckLanguage and
+ @$scope.spellCheckLanguage != ''
+ )
- runFullCheck: () ->
- @highlightedWordManager.clearRows()
- if @$scope.spellCheckLanguage and @$scope.spellCheckLanguage != ""
- @runSpellCheck()
+ onChange: (e) =>
+ if @isSpellCheckEnabled()
+ @markLinesAsUpdated(@adapter.normalizeChangeEvent(e))
+
+ @adapter.highlightedWordManager.clearHighlightTouchingRange(e)
- runCheckOnChange: (e) ->
- if @$scope.spellCheckLanguage and @$scope.spellCheckLanguage != ""
- @highlightedWordManager.applyChange(e)
- @markLinesAsUpdated(e)
@runSpellCheckSoon()
+ onSessionChange: () =>
+ @adapter.highlightedWordManager.reset()
+ @inProgressRequest.abort() if @inProgressRequest?
+
+ @runSpellCheckSoon(200) if @isSpellCheckEnabled()
+
+ onContextMenu: (e) =>
+ @closeContextMenu()
+ @openContextMenu(e)
+
+ onScroll: () => @closeContextMenu()
+
openContextMenu: (e) ->
- position = @editor.renderer.screenToTextCoordinates(e.clientX, e.clientY)
- highlight = @highlightedWordManager.findHighlightWithinRange
- start: position
- end: position
-
- @$scope.$apply () =>
- @$scope.spellingMenu.highlight = highlight
-
+ coords = @adapter.getCoordsFromContextMenuEvent(e)
+ highlight = @adapter.getHighlightFromCoords(coords)
if highlight
- e.stopPropagation()
- e.preventDefault()
-
- @editor.getSession().getSelection().setSelectionRange(
- new Range(
- highlight.row, highlight.column
- highlight.row, highlight.column + highlight.word.length
- )
- )
-
+ @adapter.preventContextMenuEventDefault(e)
+ @adapter.selectHighlightedWord(highlight)
@$scope.$apply () =>
- @$scope.spellingMenu.open = true
- @$scope.spellingMenu.left = e.clientX + 'px'
- @$scope.spellingMenu.top = e.clientY + 'px'
+ @$scope.spellMenu = {
+ open: true
+ top: coords.y + 'px'
+ left: coords.x + 'px'
+ highlight: highlight
+ }
return false
- closeContextMenu: (e) ->
- # this is triggered on scroll, so for performance only apply
- # setting when it changes
- if @$scope?.spellingMenu?.open != false
+ closeContextMenu: () ->
+ # This is triggered on scroll, so for performance only apply setting when
+ # it changes
+ if @$scope?.spellMenu and @$scope.spellMenu.open != false
@$scope.$apply () =>
- @$scope.spellingMenu.open = false
+ @$scope.spellMenu.open = false
- replaceWord: (highlight, text) ->
- @editor.getSession().replace(new Range(
- highlight.row, highlight.column,
- highlight.row, highlight.column + highlight.word.length
- ), text)
-
- learnWord: (highlight) ->
+ learnWord: (highlight) =>
@apiRequest "/learn", word: highlight.word
- @highlightedWordManager.removeWord highlight.word
+ @adapter.highlightedWordManager.removeWord highlight.word
language = @$scope.spellCheckLanguage
@cache?.put("#{language}:#{highlight.word}", true)
- getHighlightedWordAtCursor: () ->
- cursor = @editor.getCursorPosition()
- highlight = @highlightedWordManager.findHighlightWithinRange
- start: cursor
- end: cursor
- return highlight
-
- runSpellCheckSoon: (delay = 1000) ->
- run = () =>
- delete @timeoutId
- @runSpellCheck(@updatedLines)
- @updatedLines = []
- if @timeoutId?
- clearTimeout @timeoutId
- @timeoutId = setTimeout run, delay
+ runFullCheck: () ->
+ @adapter.highlightedWordManager.reset()
+ @runSpellCheck() if @isSpellCheckEnabled()
markLinesAsUpdated: (change) ->
start = change.start
@@ -146,6 +105,15 @@ define [
@updatedLines[start.row] = true
removeLines()
+ runSpellCheckSoon: (delay = 1000) ->
+ run = () =>
+ delete @timeoutId
+ @runSpellCheck(@updatedLines)
+ @updatedLines = []
+ if @timeoutId?
+ clearTimeout @timeoutId
+ @timeoutId = setTimeout run, delay
+
runSpellCheck: (linesToProcess) ->
{words, positions} = @getWords(linesToProcess)
language = @$scope.spellCheckLanguage
@@ -178,11 +146,11 @@ define [
displayResult = (highlights) =>
if linesToProcess?
for shouldProcess, row in linesToProcess
- @highlightedWordManager.clearRows(row, row) if shouldProcess
+ @adapter.highlightedWordManager.clearRow(row) if shouldProcess
else
- @highlightedWordManager.clearRows()
+ @adapter.highlightedWordManager.reset()
for highlight in highlights
- @highlightedWordManager.addHighlight highlight
+ @adapter.highlightedWordManager.addHighlight highlight
if not words.length
displayResult highlights
@@ -212,8 +180,24 @@ define [
seen[key] = true
displayResult highlights
+ apiRequest: (endpoint, data, callback = (error, result) ->)->
+ data.token = window.user.id
+ data._csrf = window.csrfToken
+ # use angular timeout option to cancel request if doc is changed
+ requestHandler = @$q.defer()
+ options = {timeout: requestHandler.promise}
+ httpRequest = @$http.post("/spelling" + endpoint, data, options)
+ .then (response) =>
+ callback(null, response.data)
+ .catch (response) =>
+ callback(new Error('api failure'))
+ # provide a method to cancel the request
+ abortRequest = () ->
+ requestHandler.resolve()
+ return { abort: abortRequest }
+
getWords: (linesToProcess) ->
- lines = @editor.getValue().split("\n")
+ lines = @adapter.getLines()
words = []
positions = []
for line, row in lines
@@ -232,22 +216,6 @@ define [
words.push(word)
return words: words, positions: positions
- apiRequest: (endpoint, data, callback = (error, result) ->)->
- data.token = window.user.id
- data._csrf = window.csrfToken
- # use angular timeout option to cancel request if doc is changed
- requestHandler = @$q.defer()
- options = {timeout: requestHandler.promise}
- httpRequest = @$http.post("/spelling" + endpoint, data, options)
- .then (response) =>
- callback(null, response.data)
- .catch (response) =>
- callback(new Error('api failure'))
- # provide a method to cancel the request
- abortRequest = () ->
- requestHandler.resolve()
- return { abort: abortRequest }
-
blacklistedCommandRegex: ///
\\ # initial backslash
(label # any of these commands
diff --git a/services/web/public/coffee/ide/settings/controllers/SettingsController.coffee b/services/web/public/coffee/ide/settings/controllers/SettingsController.coffee
index df65a2f721..9920372aab 100644
--- a/services/web/public/coffee/ide/settings/controllers/SettingsController.coffee
+++ b/services/web/public/coffee/ide/settings/controllers/SettingsController.coffee
@@ -8,6 +8,12 @@ define [
if $scope.settings.pdfViewer not in ["pdfjs", "native"]
$scope.settings.pdfViewer = "pdfjs"
+ if $scope.settings.fontFamily? and $scope.settings.fontFamily not in ["monaco", "lucida"]
+ delete $scope.settings.fontFamily
+
+ if $scope.settings.lineHeight? and $scope.settings.lineHeight not in ["compact", "normal", "wide"]
+ delete $scope.settings.lineHeight
+
$scope.fontSizeAsStr = (newVal) ->
if newVal?
$scope.settings.fontSize = newVal
@@ -41,6 +47,14 @@ define [
if syntaxValidation != oldSyntaxValidation
settings.saveSettings({syntaxValidation: syntaxValidation})
+ $scope.$watch "settings.fontFamily", (fontFamily, oldFontFamily) =>
+ if fontFamily != oldFontFamily
+ settings.saveSettings({fontFamily: fontFamily})
+
+ $scope.$watch "settings.lineHeight", (lineHeight, oldLineHeight) =>
+ if lineHeight != oldLineHeight
+ settings.saveSettings({lineHeight: lineHeight})
+
$scope.$watch "project.spellCheckLanguage", (language, oldLanguage) =>
return if @ignoreUpdates
if oldLanguage? and language != oldLanguage
diff --git a/services/web/public/coffee/main/account-upgrade.coffee b/services/web/public/coffee/main/account-upgrade.coffee
index 638371e45e..f2f67ea13d 100644
--- a/services/web/public/coffee/main/account-upgrade.coffee
+++ b/services/web/public/coffee/main/account-upgrade.coffee
@@ -11,8 +11,8 @@ define [
w = window.open()
go = () ->
ga?('send', 'event', 'subscription-funnel', 'upgraded-free-trial', source)
- if window.redirectToOLFreeTrialUrl?
- url = window.redirectToOLFreeTrialUrl
+ if window.useV2TrialUrl
+ url = "/user/trial"
else
url = "/user/subscription/new?planCode=#{plan}&ssp=true"
if couponCode?
diff --git a/services/web/public/coffee/main/contact-us.coffee b/services/web/public/coffee/main/contact-us.coffee
index 2d1dee6d34..6d3e441c49 100644
--- a/services/web/public/coffee/main/contact-us.coffee
+++ b/services/web/public/coffee/main/contact-us.coffee
@@ -1,79 +1,7 @@
define [
"base"
"libs/platform"
- "services/algolia-search"
], (App, platform) ->
- App.controller 'ContactModal', ($scope, $modal) ->
- $scope.contactUsModal = () ->
- modalInstance = $modal.open(
- templateUrl: "supportModalTemplate"
- controller: "SupportModalController"
- )
-
- App.controller 'SupportModalController', ($scope, $modalInstance, algoliaSearch, event_tracking) ->
- $scope.form = {}
- $scope.sent = false
- $scope.sending = false
- $scope.suggestions = [];
-
- _handleSearchResults = (success, results) ->
- suggestions = for hit in results.hits
- page_underscored = hit.pageName.replace(/\s/g,'_')
-
- suggestion =
- url :"/learn/kb/#{page_underscored}"
- name : hit._highlightResult.pageName.value
-
- event_tracking.sendMB "contact-form-suggestions-shown" if results.hits.length
-
- $scope.$applyAsync () ->
- $scope.suggestions = suggestions
-
- $scope.contactUs = ->
- if !$scope.form.email? or $scope.form.email == ""
- console.log "email not set"
- return
- $scope.sending = true
- ticketNumber = Math.floor((1 + Math.random()) * 0x10000).toString(32)
- message = $scope.form.message
- if $scope.form.project_url?
- message = "#{message}\n\n project_url = #{$scope.form.project_url}"
- params =
- email: $scope.form.email
- message: message or ""
- subject: $scope.form.subject + " - [#{ticketNumber}]"
- labels: "support"
- about: "
browser: #{platform?.name} #{platform?.version}
-
os: #{platform?.os?.family} #{platform?.os?.version}
"
-
- Groove.createTicket params, (response)->
- $scope.sending = false
- if response.responseText == "" # Blocked request or similar
- $scope.error = true
- else
- data = JSON.parse(response.responseText)
- if data.errors?
- $scope.error = true
- else
- $scope.sent = true
- $scope.$apply()
-
- $scope.$watch "form.subject", (newVal, oldVal) ->
- if newVal and newVal != oldVal and newVal.length > 3
- algoliaSearch.searchKB newVal, _handleSearchResults, {
- hitsPerPage: 3
- typoTolerance: 'strict'
- }
- else
- $scope.suggestions = [];
-
- $scope.clickSuggestionLink = (url) ->
- event_tracking.sendMB "contact-form-suggestions-clicked", { url }
-
- $scope.close = () ->
- $modalInstance.close()
-
-
App.controller 'UniverstiesContactController', ($scope, $modal, $http) ->
$scope.form = {}
diff --git a/services/web/public/coffee/main/learn.coffee b/services/web/public/coffee/main/learn.coffee
index eeae4219b8..375c2f0365 100644
--- a/services/web/public/coffee/main/learn.coffee
+++ b/services/web/public/coffee/main/learn.coffee
@@ -55,32 +55,4 @@ define [
hits = _.map response.hits, buildHitViewModel
updateHits hits
- $scope.showMissingTemplateModal = () ->
- modalInstance = $modal.open(
- templateUrl: "missingWikiPageModal"
- controller: "MissingWikiPageController"
- )
-
- App.controller 'MissingWikiPageController', ($scope, $modalInstance) ->
- $scope.form = {}
- $scope.sent = false
- $scope.sending = false
- $scope.contactUs = ->
- if !$scope.form.message?
- console.log "message not set"
- return
- $scope.sending = true
- ticketNumber = Math.floor((1 + Math.random()) * 0x10000).toString(32)
- params =
- email: $scope.form.email or "support@sharelatex.com"
- message: $scope.form.message or ""
- subject: "new wiki page sujection - [#{ticketNumber}]"
- labels: "support wiki"
-
- Groove.createTicket params, (err, json)->
- $scope.sent = true
- $scope.$apply()
-
- $scope.close = () ->
- $modalInstance.close()
diff --git a/services/web/public/coffee/main/project-list/project-list.coffee b/services/web/public/coffee/main/project-list/project-list.coffee
index 5880129294..36520d2cc7 100644
--- a/services/web/public/coffee/main/project-list/project-list.coffee
+++ b/services/web/public/coffee/main/project-list/project-list.coffee
@@ -8,6 +8,7 @@ define [
$scope.notifications = window.data.notifications
$scope.allSelected = false
$scope.selectedProjects = []
+ $scope.isArchiveableProjectSelected = false
$scope.filter = "all"
$scope.predicate = "lastUpdated"
$scope.nUntagged = 0
@@ -85,6 +86,8 @@ define [
$scope.updateSelectedProjects = () ->
$scope.selectedProjects = $scope.projects.filter (project) -> project.selected
+ $scope.isArchiveableProjectSelected = $scope.selectedProjects.some (project) ->
+ window.user_id == project.owner._id
$scope.getSelectedProjects = () ->
$scope.selectedProjects
diff --git a/services/web/public/coffee/services/algolia-search.coffee b/services/web/public/coffee/services/algolia-search.coffee
index d62bc6389d..9ae5eae077 100644
--- a/services/web/public/coffee/services/algolia-search.coffee
+++ b/services/web/public/coffee/services/algolia-search.coffee
@@ -8,7 +8,7 @@ define [
kbIdx = client.initIndex(window.sharelatex.algolia?.indexes?.kb)
service =
- searchWiki: wikiIdx.search.bind(wikiIdx)
- searchKB: kbIdx.search.bind(kbIdx)
+ searchWiki: if wikiIdx then wikiIdx.search.bind(wikiIdx) else null
+ searchKB: if kbIdx then kbIdx.search.bind(kbIdx) else null
return service
\ No newline at end of file
diff --git a/services/web/public/js/ace-1.2.5/theme-overleaf.js b/services/web/public/js/ace-1.2.5/theme-overleaf.js
new file mode 100644
index 0000000000..f2162a542c
--- /dev/null
+++ b/services/web/public/js/ace-1.2.5/theme-overleaf.js
@@ -0,0 +1,71 @@
+ace.define("ace/theme/overleaf",["require","exports","module","ace/lib/dom"], function(require, exports, module) {
+"use strict";
+
+exports.isDark = false;
+exports.cssClass = "ace-overleaf";
+exports.cssText = ".ace-overleaf .ace_gutter {\
+background: #f0f0f0;\
+color: #333;\
+}\
+.ace-overleaf .ace_print-margin {\
+width: 1px;\
+background: #e8e8e8;\
+}\
+.ace-overleaf {\
+background-color: #FFFFFF;\
+color: black;\
+}\
+.ace-overleaf .ace_cursor {\
+color: black;\
+}\
+.ace-overleaf .ace_marker-layer .ace_selection {\
+background: rgb(181, 213, 255);\
+}\
+.ace-overleaf.ace_multiselect .ace_selection.ace_start {\
+box-shadow: 0 0 3px 0px white;\
+}\
+.ace-overleaf .ace_marker-layer .ace_step {\
+background: rgb(252, 255, 0);\
+}\
+.ace-overleaf .ace_marker-layer .ace_bracket {\
+border: 1px solid #5A5CAD;\
+}\
+.ace-overleaf .ace_marker-layer .ace_active-line {\
+background: rgba(0, 0, 0, 0.07);\
+}\
+.ace-overleaf .ace_gutter-active-line {\
+background-color: #dcdcdc;\
+}\
+.ace-overleaf .ace_marker-layer .ace_selected-word {\
+background: rgb(250, 250, 255);\
+border: 1px solid rgb(200, 200, 250);\
+}\
+.ace-overleaf .ace_fold {\
+background-color: #6B72E6;\
+}\
+.ace-overleaf .ace_comment {\
+color: #0080FF;\
+font-style: italic;\
+}\
+.ace-overleaf .ace_storage,\
+.ace-overleaf .ace_keyword {\
+color: #3F7F7F;\
+}\
+.ace-overleaf .ace_variable,\
+.ace-overleaf .ace_string {\
+color: #5A5CAD;\
+}\
+";
+exports.$id = "ace/theme/overleaf";
+
+var dom = require("../lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
+});
+ (function() {
+ ace.require(["ace/theme/overleaf"], function(m) {
+ if (typeof module == "object" && typeof exports == "object" && module) {
+ module.exports = m;
+ }
+ });
+ })();
+
\ No newline at end of file
diff --git a/services/web/public/stylesheets/_ol_style_includes.less b/services/web/public/stylesheets/_ol_style_includes.less
index cc03279a73..70820f9b68 100644
--- a/services/web/public/stylesheets/_ol_style_includes.less
+++ b/services/web/public/stylesheets/_ol_style_includes.less
@@ -1,2 +1,3 @@
@import "app/sidebar-v2-dash-pane.less";
-@import "app/front-chat-widget.less";
\ No newline at end of file
+@import "app/front-chat-widget.less";
+@import "app/ol-chat.less";
diff --git a/services/web/public/stylesheets/_style_includes.less b/services/web/public/stylesheets/_style_includes.less
index 39ba48d94a..bbe3463cba 100644
--- a/services/web/public/stylesheets/_style_includes.less
+++ b/services/web/public/stylesheets/_style_includes.less
@@ -47,6 +47,7 @@
@import "components/tooltip.less";
@import "components/popovers.less";
@import "components/carousel.less";
+@import "components/daterange-picker";
// ngTagsInput
@import "components/tags-input.less";
@@ -80,6 +81,7 @@
@import "app/error-pages.less";
@import "app/v1-badge.less";
@import "app/editor/history-v2.less";
+@import "app/metrics.less";
// Vendor CSS
@import "../js/libs/pdfListView/TextLayer.css";
diff --git a/services/web/public/stylesheets/app/editor.less b/services/web/public/stylesheets/app/editor.less
index 8b07bd9263..0e3d48cf87 100644
--- a/services/web/public/stylesheets/app/editor.less
+++ b/services/web/public/stylesheets/app/editor.less
@@ -13,6 +13,7 @@
@import "./editor/hotkeys.less";
@import "./editor/review-panel.less";
@import "./editor/rich-text.less";
+@import "./editor/publish-modal.less";
@ui-layout-toggler-def-height: 50px;
@ui-resizer-size: 7px;
@@ -204,13 +205,9 @@
}
}
-.cm-editor-wrapper {
- height: 100%;
-
- .CodeMirror {
- height: 100%;
- }
-}
+/**************************************
+Ace
+***************************************/
// The internal components of the aceEditor directive
.ace-editor-wrapper {
@@ -285,6 +282,23 @@
}
}
+/**************************************
+CodeMirror
+***************************************/
+.cm-editor-wrapper {
+ position: relative;
+ height: 100%;
+}
+
+.cm-editor-body {
+ height: 100%;
+}
+
+// CM (for some reason) has height set to 300px in it's stylesheet
+.CodeMirror {
+ height: 100%;
+}
+
.ui-layout-resizer when (@is-overleaf = false) {
width: 6px;
background-color: @editor-resizer-bg-color;
diff --git a/services/web/public/stylesheets/app/editor/publish-modal.less b/services/web/public/stylesheets/app/editor/publish-modal.less
new file mode 100644
index 0000000000..e3320f85f0
--- /dev/null
+++ b/services/web/public/stylesheets/app/editor/publish-modal.less
@@ -0,0 +1,89 @@
+.modal-body-publish {
+ #search-input-container {
+ overflow: hidden;
+ margin: 5px 0 10px;
+ }
+ .table-content-name {
+ width: 100%;
+ margin-bottom: 10px;
+ font-weight: 300;
+ }
+ .table-content-category {
+ font-weight: 300;
+ text-align: right;
+ font-style: italic;
+ width: 30%;
+ float: right;
+ text-transform: capitalize
+ }
+ .table-content-category ~ .table-content-name {
+ width: 70%;
+ display: inline-block;
+ }
+ .wl-icon:before{
+ font-size: 14px;
+ }
+ .button-as-link{
+ color: green;
+ text-transform: none;
+ background: none;
+ padding: 0;
+ border: none;
+ border-radius: 0;
+ font-size: 14px;
+ @extend a;
+ &:hover,
+ &:active,
+ &:focus {
+ color: green;
+ background: none;
+ }
+ text-align: left;
+ }
+ .affix-content-title {
+ color: @gray-light;
+ font-size: 1.2em;
+ padding-left: 10px;
+ }
+
+ .affix-subcontent {
+ margin: 5px 0 50px;
+ }
+ .overbox {
+ padding: @line-height-computed / 2;
+ background-color: white;
+ margin-top: @line-height-computed / 2;
+ border: 1px solid @gray-lighter;
+ }
+ .content-as-table {
+ .table-content,
+ .table-content > * {
+ display: table;
+ }
+ .table-content-icon {
+ float: left;
+ height: 80px;
+ width: 106px;
+ border: 1px solid @gray-lightest;
+ display: flex;
+ align-items: center;
+ overflow: hidden;
+ * {
+ width: 100%;
+ }
+ }
+ .table-content-text {
+ float: right;
+ width: calc(~'100% - 106px');
+ vertical-align: top;
+ padding-left: 15px;
+ }
+ .table-content-slogan {
+ height: 80px;
+ overflow: hidden;
+ }
+ .table-content-link {
+ padding-top: 10px;
+ }
+ }
+}
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 5e846be008..1ed723c3b4 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -775,6 +775,12 @@
}
}
+#editor-rich-text {
+ .rp-size-expanded & {
+ right: @review-panel-width;
+ }
+}
+
.rp-toggle {
display: inline-block;
vertical-align: middle;
diff --git a/services/web/public/stylesheets/app/editor/rich-text.less b/services/web/public/stylesheets/app/editor/rich-text.less
index 493540e705..37a896269d 100644
--- a/services/web/public/stylesheets/app/editor/rich-text.less
+++ b/services/web/public/stylesheets/app/editor/rich-text.less
@@ -219,4 +219,11 @@
font-style: italic;
color: #999;
}
+
+ .spelling-error {
+ background-image: url(/img/spellcheck-underline.png);
+ background-repeat: repeat-x;
+ background-position: bottom;
+ }
}
+
diff --git a/services/web/public/stylesheets/app/metrics.less b/services/web/public/stylesheets/app/metrics.less
new file mode 100644
index 0000000000..23d121088d
--- /dev/null
+++ b/services/web/public/stylesheets/app/metrics.less
@@ -0,0 +1,177 @@
+#metrics {
+ max-width: none;
+ padding: 0 30px;
+ width: auto;
+
+ svg.nvd3-svg {
+ width: 100%;
+ }
+
+ .overbox {
+ margin: 0;
+ padding: 40px 20px;
+ background: #fff;
+ border: 1px solid #DFDFDF;
+ .box {
+ padding-bottom: 30px;
+ overflow: hidden;
+ margin-bottom: 40px;
+ border-bottom: 1px solid rgb(216, 216, 216);
+
+ .header {
+ margin-bottom: 20px;
+
+ h4 {
+ font-size: 19px;
+ margin: 0;
+ }
+ }
+ }
+ }
+
+ .print-button {
+ margin-right: 10px;
+ font-size: 20px;
+ }
+
+ .title-button {
+ margin-right: 5px;
+ font-size: 20px;
+ }
+
+ .metric-col {
+ padding: 15px;
+ }
+
+ .metric-header-container {
+ h4 {
+ margin-bottom: 0;
+ }
+ }
+
+ svg {
+ display: block;
+ height: 250px;
+ text {
+ font-family: "Open Sans", sans-serif;
+ }
+ &:not(:root) {
+ overflow: visible
+ }
+
+ &.hidden-legend-margin-fix {
+ margin-top: 15px;
+ height: 235px;
+ }
+
+ &.no-fill-opacity {
+ .nvd3 {
+ .nv-area {
+ fill-opacity: 1;
+ }
+ }
+ }
+ }
+
+ .nvtooltip {
+ z-index: 10;
+ }
+
+ .tooltip {
+ width: 150px;
+ }
+
+ // BEGIN: Metrics header
+ .metric-header-container {
+ > h4 {
+ margin-top: 0;
+ margin-bottom: 0;
+ }
+ }
+ // END: Metrics header
+
+ // BEGIN: Metrics footer
+ .metric-footer-container {
+ text-align: center;
+ }
+ // END: Metrics footer
+
+ // BEGIN: Metrics overlays
+ .metric-overlay-loading,
+ .metric-overlay-error,
+ .metric-overlay-backdrop {
+ position: absolute;
+ top: 0;
+ left: 0;
+ height: 100%;
+ width: 100%;
+ padding: 16px; /* 15px of .metric-col padding + 1px border */
+ padding-top: 56px; /* Same as above + 30px for title + 10px overbox padding*/
+ }
+
+ .metric-overlay-loading {
+ padding: 175px 20%;
+ }
+
+ .metric-overlay-error {
+ display: none;
+ text-align: center;
+ padding-top: 175px;
+ }
+
+ .metric-overlay-backdrop {
+ opacity: 0.5;
+ }
+
+ .metric-overlay-backdrop-inner {
+ background-color: #fff;
+ width: 100%;
+ height: 100%;
+ }
+ // END: Metrics overlays
+}
+
+#metrics-header {
+ @media (min-width: 1200px) {
+ margin-bottom: 30px;
+ }
+
+ .section_header {
+ margin-bottom: 0;
+ }
+
+ #filters-container {
+ text-align: right;
+
+ .by {
+ color: #989898;
+ font-style: italic;
+ }
+ }
+
+ #lags-container {
+ .dropdown-menu {
+ min-width: 0;
+ }
+ }
+
+ #dates-container {
+ display: inline-block;
+ .daterangepicker {
+ margin-right: 15px;
+ }
+ }
+}
+
+#metrics-footer {
+ margin-top: 30px;
+ text-align: center;
+}
+
+body.print-loading {
+ #metrics {
+ .metric-col {
+ opacity: 0.5;
+ }
+ }
+}
diff --git a/services/web/public/stylesheets/app/ol-chat.less b/services/web/public/stylesheets/app/ol-chat.less
new file mode 100644
index 0000000000..dd1cf692b6
--- /dev/null
+++ b/services/web/public/stylesheets/app/ol-chat.less
@@ -0,0 +1,6 @@
+// Styles for Chat panel in Overleaf v2
+
+.chat .message-wrapper .message .message-content a {
+ color: inherit;
+ text-decoration: underline;
+}
diff --git a/services/web/public/stylesheets/components/daterange-picker.less b/services/web/public/stylesheets/components/daterange-picker.less
new file mode 100644
index 0000000000..2d15d2a36d
--- /dev/null
+++ b/services/web/public/stylesheets/components/daterange-picker.less
@@ -0,0 +1,610 @@
+//
+// A stylesheet for use with Bootstrap 3.x
+// @author: Dan Grossman http://www.dangrossman.info/
+// @copyright: Copyright (c) 2012-2015 Dan Grossman. All rights reserved.
+// @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
+// @website: https://www.improvely.com/
+//
+
+//
+// VARIABLES
+//
+
+//
+// Settings
+
+// The class name to contain everything within.
+@arrow-size: 7px;
+
+//
+// Colors
+@daterangepicker-color: @brand-primary;
+@daterangepicker-bg-color: #fff;
+
+@daterangepicker-cell-color: @daterangepicker-color;
+@daterangepicker-cell-border-color: transparent;
+@daterangepicker-cell-bg-color: @daterangepicker-bg-color;
+
+@daterangepicker-cell-hover-color: @daterangepicker-color;
+@daterangepicker-cell-hover-border-color: @daterangepicker-cell-border-color;
+@daterangepicker-cell-hover-bg-color: #eee;
+
+@daterangepicker-in-range-color: #000;
+@daterangepicker-in-range-border-color: transparent;
+@daterangepicker-in-range-bg-color: #ebf4f8;
+
+@daterangepicker-active-color: #fff;
+@daterangepicker-active-bg-color: #a93529;
+@daterangepicker-active-border-color: transparent;
+
+@daterangepicker-unselected-color: #999;
+@daterangepicker-unselected-border-color: transparent;
+@daterangepicker-unselected-bg-color: #fff;
+
+//
+// daterangepicker
+@daterangepicker-width: 278px;
+@daterangepicker-padding: 4px;
+@daterangepicker-z-index: 3000;
+
+@daterangepicker-border-size: 1px;
+@daterangepicker-border-color: #ccc;
+@daterangepicker-border-radius: 4px;
+
+
+//
+// Calendar
+@daterangepicker-calendar-margin: @daterangepicker-padding;
+@daterangepicker-calendar-bg-color: @daterangepicker-bg-color;
+
+@daterangepicker-calendar-border-size: 1px;
+@daterangepicker-calendar-border-color: @daterangepicker-bg-color;
+@daterangepicker-calendar-border-radius: @daterangepicker-border-radius;
+
+//
+// Calendar Cells
+@daterangepicker-cell-size: 20px;
+@daterangepicker-cell-width: @daterangepicker-cell-size;
+@daterangepicker-cell-height: @daterangepicker-cell-size;
+
+@daterangepicker-cell-border-radius: @daterangepicker-calendar-border-radius;
+@daterangepicker-cell-border-size: 1px;
+
+//
+// Dropdowns
+@daterangepicker-dropdown-z-index: @daterangepicker-z-index + 1;
+
+//
+// Controls
+@daterangepicker-control-height: 30px;
+@daterangepicker-control-line-height: @daterangepicker-control-height;
+@daterangepicker-control-color: #555;
+
+@daterangepicker-control-border-size: 1px;
+@daterangepicker-control-border-color: #ccc;
+@daterangepicker-control-border-radius: 4px;
+
+@daterangepicker-control-active-border-size: 1px;
+@daterangepicker-control-active-border-color: @brand-primary;
+@daterangepicker-control-active-border-radius: @daterangepicker-control-border-radius;
+
+@daterangepicker-control-disabled-color: #ccc;
+
+//
+// Ranges
+@daterangepicker-ranges-color: @brand-primary;
+@daterangepicker-ranges-bg-color: daterangepicker-ranges-color;
+
+@daterangepicker-ranges-border-size: 1px;
+@daterangepicker-ranges-border-color: @daterangepicker-ranges-bg-color;
+@daterangepicker-ranges-border-radius: @daterangepicker-border-radius;
+
+@daterangepicker-ranges-hover-color: #fff;
+@daterangepicker-ranges-hover-bg-color: @daterangepicker-ranges-color;
+@daterangepicker-ranges-hover-border-size: @daterangepicker-ranges-border-size;
+@daterangepicker-ranges-hover-border-color: @daterangepicker-ranges-hover-bg-color;
+@daterangepicker-ranges-hover-border-radius: @daterangepicker-border-radius;
+
+@daterangepicker-ranges-active-border-size: @daterangepicker-ranges-border-size;
+@daterangepicker-ranges-active-border-color: @daterangepicker-ranges-bg-color;
+@daterangepicker-ranges-active-border-radius: @daterangepicker-border-radius;
+
+//
+// STYLESHEETS
+//
+.daterangepicker {
+ position: absolute;
+ color: @daterangepicker-color;
+ background-color: @daterangepicker-bg-color;
+ border-radius: @daterangepicker-border-radius;
+ width: @daterangepicker-width;
+ padding: @daterangepicker-padding;
+ margin-top: @daterangepicker-border-size;
+
+ // TODO: Should these be parameterized??
+ // top: 100px;
+ // left: 20px;
+
+ @arrow-prefix-size: @arrow-size;
+ @arrow-suffix-size: (@arrow-size - @daterangepicker-border-size);
+
+ &:before, &:after {
+ position: absolute;
+ display: inline-block;
+
+ border-bottom-color: rgba(0, 0, 0, 0.2);
+ content: '';
+ }
+
+ &:before {
+ top: -@arrow-prefix-size;
+
+ border-right: @arrow-prefix-size solid transparent;
+ border-left: @arrow-prefix-size solid transparent;
+ border-bottom: @arrow-prefix-size solid @daterangepicker-border-color;
+ }
+
+ &:after {
+ top: -@arrow-suffix-size;
+
+ border-right: @arrow-suffix-size solid transparent;
+ border-bottom: @arrow-suffix-size solid @daterangepicker-bg-color;
+ border-left: @arrow-suffix-size solid transparent;
+ }
+
+ &.opensleft {
+ &:before {
+ // TODO: Make this relative to prefix size.
+ right: @arrow-prefix-size + 2px;
+ }
+
+ &:after {
+ // TODO: Make this relative to suffix size.
+ right: @arrow-suffix-size + 4px;
+ }
+ }
+
+ &.openscenter {
+ &:before {
+ left: 0;
+ right: 0;
+ width: 0;
+ margin-left: auto;
+ margin-right: auto;
+ }
+
+ &:after {
+ left: 0;
+ right: 0;
+ width: 0;
+ margin-left: auto;
+ margin-right: auto;
+ }
+ }
+
+ &.opensright {
+ &:before {
+ // TODO: Make this relative to prefix size.
+ left: @arrow-prefix-size + 2px;
+ }
+
+ &:after {
+ // TODO: Make this relative to suffix size.
+ left: @arrow-suffix-size + 4px;
+ }
+ }
+
+ &.dropup {
+ margin-top: -5px;
+
+ // NOTE: Note sure why these are special-cased.
+ &:before {
+ top: initial;
+ bottom: -@arrow-prefix-size;
+ border-bottom: initial;
+ border-top: @arrow-prefix-size solid @daterangepicker-border-color;
+ }
+
+ &:after {
+ top: initial;
+ bottom:-@arrow-suffix-size;
+ border-bottom: initial;
+ border-top: @arrow-suffix-size solid @daterangepicker-bg-color;
+ }
+ }
+
+ &.dropdown-menu {
+ max-width: none;
+ z-index: @daterangepicker-dropdown-z-index;
+ }
+
+ &.single {
+ .ranges, .calendar {
+ float: none;
+ }
+ }
+
+ /* Calendars */
+ &.show-calendar {
+ .calendar {
+ display: block;
+ }
+ }
+
+ .calendar {
+ display: none;
+ max-width: @daterangepicker-width - (@daterangepicker-calendar-margin * 2);
+ margin: @daterangepicker-calendar-margin;
+
+ &.single {
+ .calendar-table {
+ border: none;
+ }
+ }
+
+ th, td {
+ white-space: nowrap;
+ text-align: center;
+
+ // TODO: Should this actually be hard-coded?
+ min-width: 32px;
+ }
+ }
+
+ .calendar-table {
+ border: @daterangepicker-calendar-border-size solid @daterangepicker-calendar-border-color;
+ padding: @daterangepicker-calendar-margin;
+ border-radius: @daterangepicker-calendar-border-radius;
+ background-color: @daterangepicker-calendar-bg-color;
+ }
+
+ table {
+ width: 100%;
+ margin: 0;
+ }
+
+ td, th {
+ text-align: center;
+ width: @daterangepicker-cell-width;
+ height: @daterangepicker-cell-height;
+ border-radius: @daterangepicker-cell-border-radius;
+ border: @daterangepicker-cell-border-size solid @daterangepicker-cell-border-color;
+ white-space: nowrap;
+ cursor: pointer;
+
+ &.available {
+ &:hover {
+ background-color: @daterangepicker-cell-hover-bg-color;
+ border-color: @daterangepicker-cell-hover-border-color;
+ color: @daterangepicker-cell-hover-color;
+ }
+ }
+
+ &.week {
+ font-size: 80%;
+ color: #ccc;
+ }
+ }
+
+ td {
+ &.off {
+ &, &.in-range, &.start-date, &.end-date {
+ background-color: @daterangepicker-unselected-bg-color;
+ border-color: @daterangepicker-unselected-border-color;
+ color: @daterangepicker-unselected-color;
+ }
+ }
+
+ //
+ // Date Range
+ &.in-range {
+ background-color: @daterangepicker-in-range-bg-color;
+ border-color: @daterangepicker-in-range-border-color;
+ color: @daterangepicker-in-range-color;
+
+ // TODO: Should this be static or should it be parameterized?
+ border-radius: 0;
+ }
+
+ &.start-date {
+ border-radius: @daterangepicker-cell-border-radius 0 0 @daterangepicker-cell-border-radius;
+ }
+
+ &.end-date {
+ border-radius: 0 @daterangepicker-cell-border-radius @daterangepicker-cell-border-radius 0;
+ }
+
+ &.start-date.end-date {
+ border-radius: @daterangepicker-cell-border-radius;
+ }
+
+ &.active {
+ &, &:hover {
+ background-color: @daterangepicker-active-bg-color;
+ border-color: @daterangepicker-active-border-color;
+ color: @daterangepicker-active-color;
+ }
+ }
+ }
+
+ th {
+ &.month {
+ width: auto;
+ }
+ }
+
+ //
+ // Disabled Controls
+ //
+ td, option {
+ &.disabled {
+ color: #999;
+ cursor: not-allowed;
+ text-decoration: line-through;
+ }
+ }
+
+ select {
+ &.monthselect, &.yearselect {
+ font-size: 12px;
+ padding: 1px;
+ height: auto;
+ margin: 0;
+ cursor: default;
+ }
+
+ &.monthselect {
+ margin-right: 2%;
+ width: 56%;
+ }
+
+ &.yearselect {
+ width: 40%;
+ }
+
+ &.hourselect, &.minuteselect, &.secondselect, &.ampmselect {
+ width: 50px;
+ margin-bottom: 0;
+ }
+ }
+
+ //
+ // Text Input Controls (above calendar)
+ //
+ .input-mini {
+ border: @daterangepicker-control-border-size solid @daterangepicker-control-border-color;
+ border-radius: @daterangepicker-control-border-radius;
+ color: @daterangepicker-control-color;
+ height: @daterangepicker-control-line-height;
+ line-height: @daterangepicker-control-height;
+ display: block;
+ vertical-align: middle;
+
+ // TODO: Should these all be static, too??
+ margin: 0 0 5px 0;
+ padding: 0 6px 0 28px;
+ width: 100%;
+
+ &.active {
+ border: @daterangepicker-control-active-border-size solid @daterangepicker-control-active-border-color;
+ border-radius: @daterangepicker-control-active-border-radius;
+ }
+ }
+
+ .daterangepicker_input {
+ position: relative;
+
+ i {
+ position: absolute;
+
+ // NOTE: These appear to be eyeballed to me...
+ left: 8px;
+ top: 8px;
+ }
+ }
+ &.rtl {
+ .input-mini {
+ padding-right: 28px;
+ padding-left: 6px;
+ }
+ .daterangepicker_input i {
+ left: auto;
+ right: 8px;
+ }
+ }
+
+ //
+ // Time Picker
+ //
+ .calendar-time {
+ text-align: center;
+ margin: 5px auto;
+ line-height: @daterangepicker-control-line-height;
+ position: relative;
+ padding-left: 28px;
+
+ select {
+ &.disabled {
+ color: @daterangepicker-control-disabled-color;
+ cursor: not-allowed;
+ }
+ }
+ }
+}
+
+//
+// Predefined Ranges
+//
+
+.ranges {
+ font-size: 11px;
+ float: none;
+ margin: 4px;
+ text-align: left;
+
+ ul {
+ list-style: none;
+ margin: 0 auto;
+ padding: 0;
+ width: 100%;
+ }
+
+ li {
+ font-size: 13px;
+ background-color: @daterangepicker-ranges-bg-color;
+ border: @daterangepicker-ranges-border-size solid @daterangepicker-ranges-border-color;
+ border-radius: @daterangepicker-ranges-border-radius;
+ color: @daterangepicker-ranges-color;
+ padding: 3px 12px;
+ margin-bottom: 8px;
+ cursor: pointer;
+
+ &:hover {
+ background-color: @daterangepicker-ranges-hover-bg-color;
+ border: @daterangepicker-ranges-hover-border-size solid @daterangepicker-ranges-hover-border-color;
+ color: @daterangepicker-ranges-hover-color;
+ }
+
+ &.active {
+ background-color: @daterangepicker-ranges-hover-bg-color;
+ border: @daterangepicker-ranges-hover-border-size solid @daterangepicker-ranges-hover-border-color;
+ color: @daterangepicker-ranges-hover-color;
+ }
+ }
+}
+
+/* Larger Screen Styling */
+@media (min-width: 564px) {
+ .daterangepicker {
+ width: auto;
+
+ .ranges {
+ ul {
+ width: 160px;
+ }
+ }
+
+ &.single {
+ .ranges {
+ ul {
+ width: 100%;
+ }
+ }
+
+ .calendar.left {
+ clear: none;
+ }
+
+ &.ltr {
+ .ranges, .calendar {
+ float:left;
+ }
+ }
+ &.rtl {
+ .ranges, .calendar {
+ float:right;
+ }
+ }
+ }
+
+ &.ltr {
+ direction: ltr;
+ text-align: left;
+ .calendar{
+ &.left {
+ clear: left;
+ margin-right: 0;
+
+ .calendar-table {
+ border-right: none;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ }
+ }
+
+ &.right {
+ margin-left: 0;
+
+ .calendar-table {
+ border-left: none;
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+ }
+ }
+ }
+
+ .left .daterangepicker_input {
+ padding-right: 12px;
+ }
+
+ .calendar.left .calendar-table {
+ padding-right: 12px;
+ }
+
+ .ranges, .calendar {
+ float: left;
+ }
+ }
+ &.rtl {
+ direction: rtl;
+ text-align: right;
+ .calendar{
+ &.left {
+ clear: right;
+ margin-left: 0;
+
+ .calendar-table {
+ border-left: none;
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+ }
+ }
+
+ &.right {
+ margin-right: 0;
+
+ .calendar-table {
+ border-right: none;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ }
+ }
+ }
+
+ .left .daterangepicker_input {
+ padding-left: 12px;
+ }
+
+ .calendar.left .calendar-table {
+ padding-left: 12px;
+ }
+
+ .ranges, .calendar {
+ text-align: right;
+ float: right;
+ }
+ }
+ }
+}
+
+@media (min-width: 730px) {
+ .daterangepicker {
+ .ranges {
+ width: auto;
+ }
+ &.ltr {
+ .ranges {
+ float: left;
+ }
+ }
+ &.rtl {
+ .ranges {
+ float: right;
+ }
+ }
+
+ .calendar.left {
+ clear: none !important;
+ }
+ }
+}
diff --git a/services/web/test/acceptance/coffee/ExportsTests.coffee b/services/web/test/acceptance/coffee/ExportsTests.coffee
new file mode 100644
index 0000000000..7a6784008d
--- /dev/null
+++ b/services/web/test/acceptance/coffee/ExportsTests.coffee
@@ -0,0 +1,56 @@
+expect = require('chai').expect
+request = require './helpers/request'
+_ = require 'underscore'
+
+
+User = require './helpers/User'
+ProjectGetter = require '../../../app/js/Features/Project/ProjectGetter.js'
+ExportsHandler = require '../../../app/js/Features/Exports/ExportsHandler.js'
+
+MockProjectHistoryApi = require './helpers/MockProjectHistoryApi'
+MockV1Api = require './helpers/MockV1Api'
+
+describe 'Exports', ->
+ before (done) ->
+ @brand_variation_id = '18'
+ @owner = new User()
+ @owner.login (error) =>
+ throw error if error?
+ @owner.createProject 'example-project', {template: 'example'}, (error, @project_id) =>
+ throw error if error?
+ done()
+
+ describe 'exporting a project', ->
+ beforeEach (done) ->
+ @version = Math.floor(Math.random() * 10000)
+ MockProjectHistoryApi.setProjectVersion(@project_id, @version)
+ @export_id = Math.floor(Math.random() * 10000)
+ MockV1Api.setExportId(@export_id)
+ MockV1Api.clearExportParams()
+ @owner.request {
+ method: 'POST',
+ url: "/project/#{@project_id}/export/#{@brand_variation_id}",
+ json: {},
+ }, (error, response, body) =>
+ throw error if error?
+ expect(response.statusCode).to.equal 200
+ @exportResponseBody = body
+ done()
+
+ it 'should have sent correct data to v1', (done) ->
+ {project, user, destination, options} = MockV1Api.getLastExportParams()
+ # project details should match
+ expect(project.id).to.equal @project_id
+ expect(project.rootDocPath).to.equal '/main.tex'
+ # version should match what was retrieved from project-history
+ expect(project.historyVersion).to.equal @version
+ # user details should match
+ expect(user.id).to.equal @owner.id
+ expect(user.email).to.equal @owner.email
+ # brand-variation should match
+ expect(destination.brandVariationId).to.equal @brand_variation_id
+ done()
+
+ it 'should have returned the export ID provided by v1', (done) ->
+ expect(@exportResponseBody.export_v1_id).to.equal @export_id
+ done()
diff --git a/services/web/test/acceptance/coffee/ProjectInviteTests.coffee b/services/web/test/acceptance/coffee/ProjectInviteTests.coffee
index b599578738..02598b320f 100644
--- a/services/web/test/acceptance/coffee/ProjectInviteTests.coffee
+++ b/services/web/test/acceptance/coffee/ProjectInviteTests.coffee
@@ -16,6 +16,7 @@ createInvite = (sendingUser, projectId, email, callback=(err, invite)->) ->
privileges: 'readAndWrite'
}, (err, response, body) ->
return callback(err) if err
+ expect(response.statusCode).to.equal 200
callback(null, body.invite)
createProject = (owner, projectName, callback=(err, projectId, project)->) ->
@@ -207,9 +208,9 @@ describe "ProjectInviteTests", ->
@email = 'smoketestuser@example.com'
@projectName = 'sharing test'
Async.series [
- (cb) => @user.login cb
- (cb) => @user.logout cb
+ (cb) => @user.ensureUserExists cb
(cb) => @sendingUser.login cb
+ (cb) => @sendingUser.setFeatures { collaborators: 10 }, cb
], done
describe 'creating invites', ->
@@ -266,7 +267,7 @@ describe "ProjectInviteTests", ->
(cb) => expectInvitesInJoinProjectCount @sendingUser, @projectId, 0, cb
], done
- it 'should allow the project owner to many invites at once', (done) ->
+ it 'should allow the project owner to create many invites at once', (done) ->
@inviteOne = null
@inviteTwo = null
Async.series [
diff --git a/services/web/test/acceptance/coffee/ProjectStructureMongoLockTest.coffee b/services/web/test/acceptance/coffee/ProjectStructureMongoLockTest.coffee
index 02019b74dd..7745a12ac5 100644
--- a/services/web/test/acceptance/coffee/ProjectStructureMongoLockTest.coffee
+++ b/services/web/test/acceptance/coffee/ProjectStructureMongoLockTest.coffee
@@ -22,6 +22,7 @@ describe "ProjectStructureMongoLock", ->
before (done) ->
# We want to instantly fail if the lock is taken
LockManager.MAX_LOCK_WAIT_TIME = 1
+ @lockValue = "lock-value"
userDetails =
holdingAccount:false,
email: 'test@example.com'
@@ -33,11 +34,13 @@ describe "ProjectStructureMongoLock", ->
@locked_project = project
namespace = ProjectEntityMongoUpdateHandler.LOCK_NAMESPACE
@lock_key = "lock:web:#{namespace}:#{project._id}"
- LockManager._getLock @lock_key, namespace, done
+ LockManager._getLock @lock_key, namespace, (err, lockValue) =>
+ @lockValue = lockValue
+ done()
return
after (done) ->
- LockManager._releaseLock @lock_key, done
+ LockManager._releaseLock @lock_key, @lockValue, done
describe 'interacting with the locked project', ->
LOCKING_UPDATE_METHODS = ['addDoc', 'addFile', 'mkdirp', 'moveEntity', 'renameEntity', 'addFolder']
diff --git a/services/web/test/acceptance/coffee/SubscriptionTests.coffee b/services/web/test/acceptance/coffee/SubscriptionTests.coffee
new file mode 100644
index 0000000000..ce762ea0ee
--- /dev/null
+++ b/services/web/test/acceptance/coffee/SubscriptionTests.coffee
@@ -0,0 +1,151 @@
+expect = require("chai").expect
+async = require("async")
+UserClient = require "./helpers/User"
+request = require "./helpers/request"
+settings = require "settings-sharelatex"
+{ObjectId} = require("../../../app/js/infrastructure/mongojs")
+Subscription = require("../../../app/js/models/Subscription").Subscription
+User = require("../../../app/js/models/User").User
+
+MockV1Api = require "./helpers/MockV1Api"
+
+syncUserAndGetFeatures = (user, callback = (error, features) ->) ->
+ request {
+ method: 'POST',
+ url: "/user/#{user._id}/features/sync",
+ auth:
+ user: 'sharelatex'
+ pass: 'password'
+ sendImmediately: true
+ }, (error, response, body) ->
+ throw error if error?
+ expect(response.statusCode).to.equal 200
+ User.findById user._id, (error, user) ->
+ return callback(error) if error?
+ features = user.toObject().features
+ delete features.$init # mongoose internals
+ return callback null, features
+
+describe "Subscriptions", ->
+ beforeEach (done) ->
+ @user = new UserClient()
+ @user.ensureUserExists (error) ->
+ throw error if error?
+ done()
+
+ describe "when user has no subscriptions", ->
+ it "should set their features to the basic set", (done) ->
+ syncUserAndGetFeatures @user, (error, features) =>
+ throw error if error?
+ expect(features).to.deep.equal(settings.defaultFeatures)
+ done()
+
+ describe "when the user has an individual subscription", ->
+ beforeEach ->
+ Subscription.create {
+ admin_id: @user._id
+ planCode: 'collaborator'
+ customAccount: true
+ } # returns a promise
+
+ it "should set their features to the upgraded set", (done) ->
+ syncUserAndGetFeatures @user, (error, features) =>
+ throw error if error?
+ plan = settings.plans.find (plan) -> plan.planCode == 'collaborator'
+ expect(features).to.deep.equal(plan.features)
+ done()
+
+ describe "when the user is in a group subscription", ->
+ beforeEach ->
+ Subscription.create {
+ admin_id: ObjectId()
+ member_ids: [@user._id]
+ groupAccount: true
+ planCode: 'collaborator'
+ customAccount: true
+ } # returns a promise
+
+ it "should set their features to the upgraded set", (done) ->
+ syncUserAndGetFeatures @user, (error, features) =>
+ throw error if error?
+ plan = settings.plans.find (plan) -> plan.planCode == 'collaborator'
+ expect(features).to.deep.equal(plan.features)
+ done()
+
+ describe "when the user has bonus features", ->
+ beforeEach ->
+ User.update {
+ _id: @user._id
+ }, {
+ refered_user_count: 10
+ } # returns a promise
+
+ it "should set their features to the bonus set", (done) ->
+ syncUserAndGetFeatures @user, (error, features) =>
+ throw error if error?
+ expect(features).to.deep.equal(Object.assign(
+ {}, settings.defaultFeatures, settings.bonus_features[9]
+ ))
+ done()
+
+ describe "when the user has a v1 plan", ->
+ beforeEach ->
+ MockV1Api.setUser 42, plan_name: 'free'
+ User.update {
+ _id: @user._id
+ }, {
+ overleaf:
+ id: 42
+ } # returns a promise
+
+ it "should set their features to the v1 plan", (done) ->
+ syncUserAndGetFeatures @user, (error, features) =>
+ throw error if error?
+ plan = settings.plans.find (plan) -> plan.planCode == 'v1_free'
+ expect(features).to.deep.equal(plan.features)
+ done()
+
+ describe "when the user has a v1 plan and bonus features", ->
+ beforeEach ->
+ MockV1Api.setUser 42, plan_name: 'free'
+ User.update {
+ _id: @user._id
+ }, {
+ overleaf:
+ id: 42
+ refered_user_count: 10
+ } # returns a promise
+
+ it "should set their features to the best of the v1 plan and bonus features", (done) ->
+ syncUserAndGetFeatures @user, (error, features) =>
+ throw error if error?
+ v1plan = settings.plans.find (plan) -> plan.planCode == 'v1_free'
+ expectedFeatures = Object.assign(
+ {}, v1plan.features, settings.bonus_features[9]
+ )
+ expect(features).to.deep.equal(expectedFeatures)
+ done()
+
+ describe "when the user has a group and personal subscription", ->
+ beforeEach (done) ->
+ Subscription.create {
+ admin_id: @user._id
+ planCode: 'professional'
+ customAccount: true
+ }, (error) =>
+ throw error if error?
+ Subscription.create {
+ admin_id: ObjectId()
+ member_ids: [@user._id]
+ groupAccount: true
+ planCode: 'collaborator'
+ customAccount: true
+ }, done
+ return
+
+ it "should set their features to the best set", (done) ->
+ syncUserAndGetFeatures @user, (error, features) =>
+ throw error if error?
+ plan = settings.plans.find (plan) -> plan.planCode == 'professional'
+ expect(features).to.deep.equal(plan.features)
+ done()
\ No newline at end of file
diff --git a/services/web/test/acceptance/coffee/helpers/MockProjectHistoryApi.coffee b/services/web/test/acceptance/coffee/helpers/MockProjectHistoryApi.coffee
index 381d7ab272..b7df202d72 100644
--- a/services/web/test/acceptance/coffee/helpers/MockProjectHistoryApi.coffee
+++ b/services/web/test/acceptance/coffee/helpers/MockProjectHistoryApi.coffee
@@ -6,9 +6,14 @@ module.exports = MockProjectHistoryApi =
oldFiles: {}
+ projectVersions: {}
+
addOldFile: (project_id, version, pathname, content) ->
@oldFiles["#{project_id}:#{version}:#{pathname}"] = content
+ setProjectVersion: (project_id, version) ->
+ @projectVersions[project_id] = version
+
run: () ->
app.post "/project", (req, res, next) =>
res.json project: id: 1
@@ -21,6 +26,13 @@ module.exports = MockProjectHistoryApi =
else
res.send 404
+ app.get "/project/:project_id/version", (req, res, next) =>
+ {project_id} = req.params
+ if @projectVersions[project_id]?
+ res.json version: @projectVersions[project_id]
+ else
+ res.send 404
+
app.listen 3054, (error) ->
throw error if error?
.on "error", (error) ->
diff --git a/services/web/test/acceptance/coffee/helpers/MockV1Api.coffee b/services/web/test/acceptance/coffee/helpers/MockV1Api.coffee
new file mode 100644
index 0000000000..5c2cf47ad9
--- /dev/null
+++ b/services/web/test/acceptance/coffee/helpers/MockV1Api.coffee
@@ -0,0 +1,45 @@
+express = require("express")
+app = express()
+bodyParser = require('body-parser')
+
+app.use(bodyParser.json())
+
+module.exports = MockV1Api =
+ users: { }
+
+ setUser: (id, user) ->
+ @users[id] = user
+
+ exportId: null
+
+ exportParams: null
+
+ setExportId: (id) ->
+ @exportId = id
+
+ getLastExportParams: () ->
+ @exportParams
+
+ clearExportParams: () ->
+ @exportParams = null
+
+ run: () ->
+ app.get "/api/v1/sharelatex/users/:ol_user_id/plan_code", (req, res, next) =>
+ user = @users[req.params.ol_user_id]
+ if user
+ res.json user
+ else
+ res.sendStatus 404
+
+ app.post "/api/v1/sharelatex/exports", (req, res, next) =>
+ #{project, version, pathname}
+ @exportParams = Object.assign({}, req.body)
+ res.json exportId: @exportId
+
+ app.listen 5000, (error) ->
+ throw error if error?
+ .on "error", (error) ->
+ console.error "error starting MockV1Api:", error.message
+ process.exit(1)
+
+MockV1Api.run()
diff --git a/services/web/test/acceptance/coffee/helpers/User.coffee b/services/web/test/acceptance/coffee/helpers/User.coffee
index 7d8e9086d4..a02ab5c42c 100644
--- a/services/web/test/acceptance/coffee/helpers/User.coffee
+++ b/services/web/test/acceptance/coffee/helpers/User.coffee
@@ -40,6 +40,12 @@ class User
@referal_id = user?.referal_id
callback(null, @password)
+ setFeatures: (features, callback = (error) ->) ->
+ update = {}
+ for key, value of features
+ update["features.#{key}"] = value
+ UserModel.update { _id: @id }, update, callback
+
logout: (callback = (error) ->) ->
@getCsrfToken (error) =>
return callback(error) if error?
diff --git a/services/web/test/acceptance/config/settings.test.coffee b/services/web/test/acceptance/config/settings.test.coffee
new file mode 100644
index 0000000000..3d665f8a54
--- /dev/null
+++ b/services/web/test/acceptance/config/settings.test.coffee
@@ -0,0 +1,95 @@
+module.exports =
+ enableSubscriptions: true
+
+ features: features =
+ v1_free:
+ collaborators: 1
+ dropbox: false
+ versioning: false
+ github: true
+ templates: false
+ references: false
+ referencesSearch: false
+ mendeley: true
+ compileTimeout: 60
+ compileGroup: "standard"
+ trackChanges: false
+ personal:
+ collaborators: 1
+ dropbox: false
+ versioning: false
+ github: false
+ templates: false
+ references: false
+ referencesSearch: false
+ mendeley: false
+ compileTimeout: 60
+ compileGroup: "standard"
+ trackChanges: false
+ collaborator:
+ collaborators: 10
+ dropbox: true
+ versioning: true
+ github: true
+ templates: true
+ references: true
+ referencesSearch: true
+ mendeley: true
+ compileTimeout: 180
+ compileGroup: "priority"
+ trackChanges: true
+ professional:
+ collaborators: -1
+ dropbox: true
+ versioning: true
+ github: true
+ templates: true
+ references: true
+ referencesSearch: true
+ mendeley: true
+ compileTimeout: 180
+ compileGroup: "priority"
+ trackChanges: true
+
+ defaultFeatures: features.personal
+ defaultPlanCode: 'personal'
+
+ plans: plans = [{
+ planCode: "v1_free"
+ name: "V1 Free"
+ price: 0
+ features: features.v1_free
+ },{
+ planCode: "personal"
+ name: "Personal"
+ price: 0
+ features: features.personal
+ },{
+ planCode: "collaborator"
+ name: "Collaborator"
+ price: 1500
+ features: features.collaborator
+ },{
+ planCode: "professional"
+ name: "Professional"
+ price: 3000
+ features: features.professional
+ }]
+
+ bonus_features:
+ 1:
+ collaborators: 2
+ dropbox: false
+ versioning: false
+ 3:
+ collaborators: 4
+ dropbox: false
+ versioning: false
+ 6:
+ collaborators: 4
+ dropbox: true
+ versioning: true
+ 9:
+ collaborators: -1
+ dropbox: true
+ versioning: true
diff --git a/services/web/test/unit/coffee/BetaProgram/BetaProgramControllerTests.coffee b/services/web/test/unit/coffee/BetaProgram/BetaProgramControllerTests.coffee
index ab1f1b0567..713179b056 100644
--- a/services/web/test/unit/coffee/BetaProgram/BetaProgramControllerTests.coffee
+++ b/services/web/test/unit/coffee/BetaProgram/BetaProgramControllerTests.coffee
@@ -23,8 +23,8 @@ describe "BetaProgramController", ->
optIn: sinon.stub()
optOut: sinon.stub()
},
- "../User/UserLocator": @UserLocator = {
- findById: sinon.stub()
+ "../User/UserGetter": @UserGetter = {
+ getUser: sinon.stub()
},
"settings-sharelatex": @settings = {
languages: {}
@@ -119,7 +119,7 @@ describe "BetaProgramController", ->
describe "optInPage", ->
beforeEach ->
- @UserLocator.findById.callsArgWith(1, null, @user)
+ @UserGetter.getUser.callsArgWith(1, null, @user)
it "should render the opt-in page", () ->
@BetaProgramController.optInPage @req, @res, @next
@@ -128,10 +128,10 @@ describe "BetaProgramController", ->
args[0].should.equal 'beta_program/opt_in'
- describe "when UserLocator.findById produces an error", ->
+ describe "when UserGetter.getUser produces an error", ->
beforeEach ->
- @UserLocator.findById.callsArgWith(1, new Error('woops'))
+ @UserGetter.getUser.callsArgWith(1, new Error('woops'))
it "should not render the opt-in page", () ->
@BetaProgramController.optInPage @req, @res, @next
diff --git a/services/web/test/unit/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee b/services/web/test/unit/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee
index cdfff78249..4b57ff3697 100644
--- a/services/web/test/unit/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee
+++ b/services/web/test/unit/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee
@@ -24,11 +24,14 @@ describe "CollaboratorsInviteController", ->
addCount: sinon.stub
@LimitationsManager = {}
+ @UserGetter =
+ getUserByMainEmail: sinon.stub()
+ getUser: sinon.stub()
@CollaboratorsInviteController = SandboxedModule.require modulePath, requires:
"../Project/ProjectGetter": @ProjectGetter = {}
'../Subscription/LimitationsManager' : @LimitationsManager
- '../User/UserGetter': @UserGetter = {getUser: sinon.stub()}
+ '../User/UserGetter': @UserGetter
"./CollaboratorsHandler": @CollaboratorsHandler = {}
"./CollaboratorsInviteHandler": @CollaboratorsInviteHandler = {}
'logger-sharelatex': @logger = {err: sinon.stub(), error: sinon.stub(), log: sinon.stub()}
@@ -713,7 +716,7 @@ describe "CollaboratorsInviteController", ->
beforeEach ->
@user = {_id: ObjectId().toString()}
- @UserGetter.getUser = sinon.stub().callsArgWith(2, null, @user)
+ @UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, null, @user)
it 'should callback with `true`', (done) ->
@call (err, shouldAllow) =>
@@ -725,7 +728,7 @@ describe "CollaboratorsInviteController", ->
beforeEach ->
@user = null
- @UserGetter.getUser = sinon.stub().callsArgWith(2, null, @user)
+ @UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, null, @user)
it 'should callback with `false`', (done) ->
@call (err, shouldAllow) =>
@@ -735,15 +738,15 @@ describe "CollaboratorsInviteController", ->
it 'should have called getUser', (done) ->
@call (err, shouldAllow) =>
- @UserGetter.getUser.callCount.should.equal 1
- @UserGetter.getUser.calledWith({email: @email}, {_id: 1}).should.equal true
+ @UserGetter.getUserByMainEmail.callCount.should.equal 1
+ @UserGetter.getUserByMainEmail.calledWith(@email, {_id: 1}).should.equal true
done()
describe 'when getUser produces an error', ->
beforeEach ->
@user = null
- @UserGetter.getUser = sinon.stub().callsArgWith(2, new Error('woops'))
+ @UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, new Error('woops'))
it 'should callback with an error', (done) ->
@call (err, shouldAllow) =>
diff --git a/services/web/test/unit/coffee/Collaborators/CollaboratorsInviteHandlerTests.coffee b/services/web/test/unit/coffee/Collaborators/CollaboratorsInviteHandlerTests.coffee
index 177c42d4ba..58b373f61f 100644
--- a/services/web/test/unit/coffee/Collaborators/CollaboratorsInviteHandlerTests.coffee
+++ b/services/web/test/unit/coffee/Collaborators/CollaboratorsInviteHandlerTests.coffee
@@ -605,7 +605,7 @@ describe "CollaboratorsInviteHandler", ->
_id: ObjectId()
first_name: "jim"
@existingUser = {_id: ObjectId()}
- @UserGetter.getUser = sinon.stub().callsArgWith(2, null, @existingUser)
+ @UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, null, @existingUser)
@fakeProject =
_id: @project_id
name: "some project"
@@ -626,8 +626,8 @@ describe "CollaboratorsInviteHandler", ->
it 'should call getUser', (done) ->
@call (err) =>
- @UserGetter.getUser.callCount.should.equal 1
- @UserGetter.getUser.calledWith({email: @invite.email}).should.equal true
+ @UserGetter.getUserByMainEmail.callCount.should.equal 1
+ @UserGetter.getUserByMainEmail.calledWith(@invite.email).should.equal true
done()
it 'should call getProject', (done) ->
@@ -671,7 +671,7 @@ describe "CollaboratorsInviteHandler", ->
describe 'when the user does not exist', ->
beforeEach ->
- @UserGetter.getUser = sinon.stub().callsArgWith(2, null, null)
+ @UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, null, null)
it 'should not produce an error', (done) ->
@call (err) =>
@@ -680,8 +680,8 @@ describe "CollaboratorsInviteHandler", ->
it 'should call getUser', (done) ->
@call (err) =>
- @UserGetter.getUser.callCount.should.equal 1
- @UserGetter.getUser.calledWith({email: @invite.email}).should.equal true
+ @UserGetter.getUserByMainEmail.callCount.should.equal 1
+ @UserGetter.getUserByMainEmail.calledWith(@invite.email).should.equal true
done()
it 'should not call getProject', (done) ->
@@ -698,7 +698,7 @@ describe "CollaboratorsInviteHandler", ->
describe 'when the getUser produces an error', ->
beforeEach ->
- @UserGetter.getUser = sinon.stub().callsArgWith(2, new Error('woops'))
+ @UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, new Error('woops'))
it 'should produce an error', (done) ->
@call (err) =>
@@ -707,8 +707,8 @@ describe "CollaboratorsInviteHandler", ->
it 'should call getUser', (done) ->
@call (err) =>
- @UserGetter.getUser.callCount.should.equal 1
- @UserGetter.getUser.calledWith({email: @invite.email}).should.equal true
+ @UserGetter.getUserByMainEmail.callCount.should.equal 1
+ @UserGetter.getUserByMainEmail.calledWith(@invite.email).should.equal true
done()
it 'should not call getProject', (done) ->
diff --git a/services/web/test/unit/coffee/Exports/ExportsControllerTests.coffee b/services/web/test/unit/coffee/Exports/ExportsControllerTests.coffee
new file mode 100644
index 0000000000..821eb5b4e0
--- /dev/null
+++ b/services/web/test/unit/coffee/Exports/ExportsControllerTests.coffee
@@ -0,0 +1,39 @@
+SandboxedModule = require('sandboxed-module')
+assert = require('assert')
+chai = require('chai')
+expect = chai.expect
+sinon = require('sinon')
+modulePath = require('path').join __dirname, '../../../../app/js/Features/Exports/ExportsController.js'
+
+
+describe 'ExportsController', ->
+ project_id = "123njdskj9jlk"
+ user_id = "123nd3ijdks"
+ brand_variation_id = 22
+
+ beforeEach ->
+ @handler =
+ getUserNotifications: sinon.stub().callsArgWith(1)
+ @req =
+ params:
+ project_id: project_id
+ brand_variation_id: brand_variation_id
+ session:
+ user:
+ _id:user_id
+ i18n:
+ translate:->
+ @AuthenticationController =
+ getLoggedInUserId: sinon.stub().returns(@req.session.user._id)
+ @controller = SandboxedModule.require modulePath, requires:
+ "./ExportsHandler":@handler
+ 'logger-sharelatex':
+ log:->
+ err:->
+ '../Authentication/AuthenticationController': @AuthenticationController
+
+ it 'should ask the handler to perform the export', (done) ->
+ @handler.exportProject = sinon.stub().yields(null, {iAmAnExport: true, v1_id: 897})
+ @controller.exportProject @req, send:(body) =>
+ expect(body).to.deep.equal {export_v1_id: 897}
+ done()
diff --git a/services/web/test/unit/coffee/Exports/ExportsHandlerTests.coffee b/services/web/test/unit/coffee/Exports/ExportsHandlerTests.coffee
new file mode 100644
index 0000000000..6333db8270
--- /dev/null
+++ b/services/web/test/unit/coffee/Exports/ExportsHandlerTests.coffee
@@ -0,0 +1,202 @@
+sinon = require('sinon')
+chai = require('chai')
+should = chai.should()
+expect = chai.expect
+modulePath = '../../../../app/js/Features/Exports/ExportsHandler.js'
+SandboxedModule = require('sandboxed-module')
+
+describe 'ExportsHandler', ->
+
+ beforeEach ->
+ @ProjectGetter = {}
+ @ProjectLocator = {}
+ @UserGetter = {}
+ @settings = {}
+ @stubRequest = {}
+ @request = defaults: => return @stubRequest
+ @ExportsHandler = SandboxedModule.require modulePath, requires:
+ 'logger-sharelatex':
+ log: ->
+ err: ->
+ '../Project/ProjectGetter': @ProjectGetter
+ '../Project/ProjectLocator': @ProjectLocator
+ '../User/UserGetter': @UserGetter
+ 'settings-sharelatex': @settings
+ 'request': @request
+ @project_id = "project-id-123"
+ @project_history_id = 987
+ @user_id = "user-id-456"
+ @brand_variation_id = 789
+ @callback = sinon.stub()
+
+ describe 'exportProject', ->
+ beforeEach (done) ->
+ @export_data = {iAmAnExport: true}
+ @response_body = {iAmAResponseBody: true}
+ @ExportsHandler._buildExport = sinon.stub().yields(null, @export_data)
+ @ExportsHandler._requestExport = sinon.stub().yields(null, @response_body)
+ @ExportsHandler.exportProject @project_id, @user_id, @brand_variation_id, (error, export_data) =>
+ @callback(error, export_data)
+ done()
+
+ it "should build the export", ->
+ @ExportsHandler._buildExport
+ .calledWith(@project_id, @user_id, @brand_variation_id)
+ .should.equal true
+
+ it "should request the export", ->
+ @ExportsHandler._requestExport
+ .calledWith(@export_data)
+ .should.equal true
+
+ it "should return the export", ->
+ @callback
+ .calledWith(null, @export_data)
+ .should.equal true
+
+ describe '_buildExport', ->
+ beforeEach (done) ->
+ @project =
+ id: @project_id
+ overleaf:
+ history:
+ id: @project_history_id
+ @user =
+ id: @user_id
+ first_name: 'Arthur'
+ last_name: 'Author'
+ email: 'arthur.author@arthurauthoring.org'
+ @rootDocPath = 'main.tex'
+ @historyVersion = 777
+ @ProjectGetter.getProject = sinon.stub().yields(null, @project)
+ @ProjectLocator.findRootDoc = sinon.stub().yields(null, [null, {fileSystem: 'main.tex'}])
+ @UserGetter.getUser = sinon.stub().yields(null, @user)
+ @ExportsHandler._requestVersion = sinon.stub().yields(null, @historyVersion)
+ done()
+
+ describe "when all goes well", ->
+ beforeEach (done) ->
+ @ExportsHandler._buildExport @project_id, @user_id, @brand_variation_id, (error, export_data) =>
+ @callback(error, export_data)
+ done()
+
+ it "should request the project history version", ->
+ @ExportsHandler._requestVersion.called
+ .should.equal true
+
+ it "should return export data", ->
+ expected_export_data =
+ project:
+ id: @project_id
+ rootDocPath: @rootDocPath
+ historyId: @project_history_id
+ historyVersion: @historyVersion
+ user:
+ id: @user_id
+ firstName: @user.first_name
+ lastName: @user.last_name
+ email: @user.email
+ orcidId: null
+ destination:
+ brandVariationId: @brand_variation_id
+ options:
+ callbackUrl: null
+ @callback.calledWith(null, expected_export_data)
+ .should.equal true
+
+ describe "when project is not found", ->
+ beforeEach (done) ->
+ @ProjectGetter.getProject = sinon.stub().yields(new Error("project not found"))
+ @ExportsHandler._buildExport @project_id, @user_id, @brand_variation_id, (error, export_data) =>
+ @callback(error, export_data)
+ done()
+
+ it "should return an error", ->
+ (@callback.args[0][0] instanceof Error)
+ .should.equal true
+
+ describe "when project has no root doc", ->
+ beforeEach (done) ->
+ @ProjectLocator.findRootDoc = sinon.stub().yields(null, [null, null])
+ @ExportsHandler._buildExport @project_id, @user_id, @brand_variation_id, (error, export_data) =>
+ @callback(error, export_data)
+ done()
+
+ it "should return an error", ->
+ (@callback.args[0][0] instanceof Error)
+ .should.equal true
+
+ describe "when user is not found", ->
+ beforeEach (done) ->
+ @UserGetter.getUser = sinon.stub().yields(new Error("user not found"))
+ @ExportsHandler._buildExport @project_id, @user_id, @brand_variation_id, (error, export_data) =>
+ @callback(error, export_data)
+ done()
+
+ it "should return an error", ->
+ (@callback.args[0][0] instanceof Error)
+ .should.equal true
+
+ describe "when project history request fails", ->
+ beforeEach (done) ->
+ @ExportsHandler._requestVersion = sinon.stub().yields(new Error("project history call failed"))
+ @ExportsHandler._buildExport @project_id, @user_id, @brand_variation_id, (error, export_data) =>
+ @callback(error, export_data)
+ done()
+
+ it "should return an error", ->
+ (@callback.args[0][0] instanceof Error)
+ .should.equal true
+
+ describe '_requestExport', ->
+ beforeEach (done) ->
+ @settings.apis =
+ v1:
+ url: 'http://localhost:5000'
+ user: 'overleaf'
+ pass: 'pass'
+ @export_data = {iAmAnExport: true}
+ @export_id = 4096
+ @stubPost = sinon.stub().yields(null, {statusCode: 200}, { exportId: @export_id })
+ done()
+
+ describe "when all goes well", ->
+ beforeEach (done) ->
+ @stubRequest.post = @stubPost
+ @ExportsHandler._requestExport @export_data, (error, export_v1_id) =>
+ @callback(error, export_v1_id)
+ done()
+
+ it 'should issue the request', ->
+ expect(@stubPost.getCall(0).args[0]).to.deep.equal
+ url: @settings.apis.v1.url + '/api/v1/sharelatex/exports'
+ auth:
+ user: @settings.apis.v1.user
+ pass: @settings.apis.v1.pass
+ json: @export_data
+
+ it 'should return the v1 export id', ->
+ @callback.calledWith(null, @export_id)
+ .should.equal true
+
+ describe "when the request fails", ->
+ beforeEach (done) ->
+ @stubRequest.post = sinon.stub().yields(new Error("export request failed"))
+ @ExportsHandler._requestExport @export_data, (error, export_v1_id) =>
+ @callback(error, export_v1_id)
+ done()
+
+ it "should return an error", ->
+ (@callback.args[0][0] instanceof Error)
+ .should.equal true
+
+ describe "when the request returns an error code", ->
+ beforeEach (done) ->
+ @stubRequest.post = sinon.stub().yields(null, {statusCode: 401}, { })
+ @ExportsHandler._requestExport @export_data, (error, export_v1_id) =>
+ @callback(error, export_v1_id)
+ done()
+
+ it "should return the error", ->
+ (@callback.args[0][0] instanceof Error)
+ .should.equal true
diff --git a/services/web/test/unit/coffee/PasswordReset/PasswordResetHandlerTests.coffee b/services/web/test/unit/coffee/PasswordReset/PasswordResetHandlerTests.coffee
index b29839246a..261f5582dd 100644
--- a/services/web/test/unit/coffee/PasswordReset/PasswordResetHandlerTests.coffee
+++ b/services/web/test/unit/coffee/PasswordReset/PasswordResetHandlerTests.coffee
@@ -16,7 +16,7 @@ describe "PasswordResetHandler", ->
getNewToken:sinon.stub()
getValueFromTokenAndExpire:sinon.stub()
@UserGetter =
- getUser:sinon.stub()
+ getUserByMainEmail:sinon.stub()
@EmailHandler =
sendEmail:sinon.stub()
@AuthenticationManager =
@@ -40,7 +40,7 @@ describe "PasswordResetHandler", ->
describe "generateAndEmailResetToken", ->
it "should check the user exists", (done)->
- @UserGetter.getUser.callsArgWith(1)
+ @UserGetter.getUserByMainEmail.callsArgWith(1)
@OneTimeTokenHandler.getNewToken.callsArgWith(1)
@PasswordResetHandler.generateAndEmailResetToken @user.email, (err, exists)=>
exists.should.equal false
@@ -49,7 +49,7 @@ describe "PasswordResetHandler", ->
it "should send the email with the token", (done)->
- @UserGetter.getUser.callsArgWith(1, null, @user)
+ @UserGetter.getUserByMainEmail.callsArgWith(1, null, @user)
@OneTimeTokenHandler.getNewToken.callsArgWith(1, null, @token)
@EmailHandler.sendEmail.callsArgWith(2)
@PasswordResetHandler.generateAndEmailResetToken @user.email, (err, exists)=>
@@ -62,7 +62,7 @@ describe "PasswordResetHandler", ->
it "should return exists = false for a holdingAccount", (done) ->
@user.holdingAccount = true
- @UserGetter.getUser.callsArgWith(1, null, @user)
+ @UserGetter.getUserByMainEmail.callsArgWith(1, null, @user)
@OneTimeTokenHandler.getNewToken.callsArgWith(1)
@PasswordResetHandler.generateAndEmailResetToken @user.email, (err, exists)=>
exists.should.equal false
diff --git a/services/web/test/unit/coffee/Project/ProjectControllerTests.coffee b/services/web/test/unit/coffee/Project/ProjectControllerTests.coffee
index 4e1402429b..ec7246754c 100644
--- a/services/web/test/unit/coffee/Project/ProjectControllerTests.coffee
+++ b/services/web/test/unit/coffee/Project/ProjectControllerTests.coffee
@@ -15,6 +15,7 @@ describe "ProjectController", ->
@user =
_id:"588f3ddae8ebc1bac07c9fa4"
first_name: "bjkdsjfk"
+ features: {}
@settings =
apis:
chat:
@@ -300,6 +301,33 @@ describe "ProjectController", ->
done()
@ProjectController.projectListPage @req, @res
+ describe 'front widget', (done) ->
+ beforeEach ->
+ @settings.overleaf =
+ front_chat_widget_room_id: 'chat-room-id'
+
+ it 'should show for paid users', (done) ->
+ @user.features.github = true
+ @user.features.dropbox = true
+ @res.render = (pageName, opts)=>
+ opts.frontChatWidgetRoomId.should.equal @settings.overleaf.front_chat_widget_room_id
+ done()
+ @ProjectController.projectListPage @req, @res
+
+ it 'should show for sample users', (done) ->
+ @user._id = '588f3ddae8ebc1bac07c9f00' # last two digits
+ @res.render = (pageName, opts)=>
+ opts.frontChatWidgetRoomId.should.equal @settings.overleaf.front_chat_widget_room_id
+ done()
+ @ProjectController.projectListPage @req, @res
+
+ it 'should not show for non sample users', (done) ->
+ @user._id = '588f3ddae8ebc1bac07c9fff' # last two digits
+ @res.render = (pageName, opts)=>
+ expect(opts.frontChatWidgetRoomId).to.equal undefined
+ done()
+ @ProjectController.projectListPage @req, @res
+
describe 'with overleaf-integration-web-module hook', ->
beforeEach ->
@V1Response =
diff --git a/services/web/test/unit/coffee/Project/ProjectCreationHandlerTests.coffee b/services/web/test/unit/coffee/Project/ProjectCreationHandlerTests.coffee
index 042dc34d09..6d86545622 100644
--- a/services/web/test/unit/coffee/Project/ProjectCreationHandlerTests.coffee
+++ b/services/web/test/unit/coffee/Project/ProjectCreationHandlerTests.coffee
@@ -98,7 +98,11 @@ describe 'ProjectCreationHandler', ->
it "should set the overleaf id if overleaf id provided", (done)->
overleaf_id = 2345
- @handler.createBlankProject ownerId, projectName, overleaf_id, (err, project)->
+ attributes =
+ overleaf:
+ history:
+ id: overleaf_id
+ @handler.createBlankProject ownerId, projectName, attributes, (err, project)->
project.overleaf.history.id.should.equal overleaf_id
done()
diff --git a/services/web/test/unit/coffee/Project/ProjectEntityUpdateHandlerTests.coffee b/services/web/test/unit/coffee/Project/ProjectEntityUpdateHandlerTests.coffee
index 2838db9c56..3a5b7a58bd 100644
--- a/services/web/test/unit/coffee/Project/ProjectEntityUpdateHandlerTests.coffee
+++ b/services/web/test/unit/coffee/Project/ProjectEntityUpdateHandlerTests.coffee
@@ -872,6 +872,12 @@ describe 'ProjectEntityUpdateHandler', ->
.calledWith(@project, @entity, @path, userId)
.should.equal true
+ it "should should send the update to the doc updater", ->
+ oldDocs = [ doc: @entity, path: @path ]
+ @DocumentUpdaterHandler.updateProjectStructure
+ .calledWith(project_id, projectHistoryId, userId, {oldDocs})
+ .should.equal true
+
describe "a folder", ->
beforeEach (done) ->
@folder =
@@ -905,6 +911,13 @@ describe 'ProjectEntityUpdateHandler', ->
.calledWith(@project, @doc2, "/folder/doc-name-2", userId)
.should.equal true
+ it "should should send one update to the doc updater for all docs and files", ->
+ oldFiles = [ {file: @file2, path: "/folder/file-name-2"}, {file: @file1, path: "/folder/subfolder/file-name-1"} ]
+ oldDocs = [ {doc: @doc2, path: "/folder/doc-name-2"}, { doc: @doc1, path: "/folder/subfolder/doc-name-1"} ]
+ @DocumentUpdaterHandler.updateProjectStructure
+ .calledWith(project_id, projectHistoryId, userId, {oldFiles, oldDocs})
+ .should.equal true
+
describe "_cleanUpDoc", ->
beforeEach ->
@doc =
@@ -941,12 +954,6 @@ describe 'ProjectEntityUpdateHandler', ->
.calledWith(project_id, @doc._id.toString())
.should.equal true
- it "should should send the update to the doc updater", ->
- oldDocs = [ doc: @doc, path: @path ]
- @DocumentUpdaterHandler.updateProjectStructure
- .calledWith(project_id, projectHistoryId, userId, {oldDocs})
- .should.equal true
-
it "should call the callback", ->
@callback.called.should.equal true
diff --git a/services/web/test/unit/coffee/Referal/ReferalAllocatorTests.coffee b/services/web/test/unit/coffee/Referal/ReferalAllocatorTests.coffee
index 3fe925f91c..308c2ce80e 100644
--- a/services/web/test/unit/coffee/Referal/ReferalAllocatorTests.coffee
+++ b/services/web/test/unit/coffee/Referal/ReferalAllocatorTests.coffee
@@ -4,12 +4,12 @@ require('chai').should()
sinon = require('sinon')
modulePath = require('path').join __dirname, '../../../../app/js/Features/Referal/ReferalAllocator.js'
-describe 'Referalallocator', ->
+describe 'ReferalAllocator', ->
beforeEach ->
@ReferalAllocator = SandboxedModule.require modulePath, requires:
'../../models/User': User: @User = {}
- "../Subscription/SubscriptionLocator": @SubscriptionLocator = {}
+ "../Subscription/FeaturesUpdater": @FeaturesUpdater = {}
"settings-sharelatex": @Settings = {}
'logger-sharelatex':
log:->
@@ -26,7 +26,7 @@ describe 'Referalallocator', ->
@referal_source = "bonus"
@User.update = sinon.stub().callsArgWith 3, null
@User.findOne = sinon.stub().callsArgWith 1, null, { _id: @user_id }
- @ReferalAllocator.assignBonus = sinon.stub().callsArg 1
+ @FeaturesUpdater.refreshFeatures = sinon.stub().yields()
@ReferalAllocator.allocate @referal_id, @new_user_id, @referal_source, @referal_medium, @callback
it 'should update the referring user with the refered users id', ->
@@ -44,8 +44,8 @@ describe 'Referalallocator', ->
.calledWith( referal_id: @referal_id )
.should.equal true
- it "shoudl assign the user their bonus", ->
- @ReferalAllocator.assignBonus
+ it "should refresh the user's subscription", ->
+ @FeaturesUpdater.refreshFeatures
.calledWith(@user_id)
.should.equal true
@@ -57,7 +57,7 @@ describe 'Referalallocator', ->
@referal_source = "public_share"
@User.update = sinon.stub().callsArgWith 3, null
@User.findOne = sinon.stub().callsArgWith 1, null, { _id: @user_id }
- @ReferalAllocator.assignBonus = sinon.stub().callsArg 1
+ @FeaturesUpdater.refreshFeatures = sinon.stub().yields()
@ReferalAllocator.allocate @referal_id, @new_user_id, @referal_source, @referal_medium, @callback
it 'should not update the referring user with the refered users id', ->
@@ -69,118 +69,7 @@ describe 'Referalallocator', ->
.should.equal true
it "should not assign the user a bonus", ->
- @ReferalAllocator.assignBonus.called.should.equal false
+ @FeaturesUpdater.refreshFeatures.called.should.equal false
it "should call the callback", ->
@callback.called.should.equal true
-
- describe "assignBonus", ->
- beforeEach ->
- @refered_user_count = 3
- @Settings.bonus_features =
- "3":
- collaborators: 3
- dropbox: false
- versioning: false
- stubbedUser = {
- refered_user_count: @refered_user_count,
- features:{collaborators:1, dropbox:false, versioning:false}
- }
-
- @User.findOne = sinon.stub().callsArgWith 1, null, stubbedUser
- @User.update = sinon.stub().callsArgWith 2, null
- @ReferalAllocator.assignBonus @user_id, @callback
-
- it "should get the users number of refered user", ->
- @User.findOne
- .calledWith(_id: @user_id)
- .should.equal true
-
- it "should update the user to bonus features", ->
- @User.update
- .calledWith({
- _id: @user_id
- }, {
- $set:
- features:
- @Settings.bonus_features[@refered_user_count.toString()]
- })
- .should.equal true
-
- it "should call the callback", ->
- @callback.called.should.equal true
-
- describe "when there is nothing to assign", ->
-
- beforeEach ->
- @ReferalAllocator._calculateBonuses = sinon.stub().returns({})
- @stubbedUser =
- refered_user_count:4
- features:{collaborators:3, versioning:true, dropbox:false}
- @Settings.bonus_features =
- "4":
- collaborators:3
- versioning:true
- dropbox:false
- @User.findOne = sinon.stub().callsArgWith 1, null, @stubbedUser
- @User.update = sinon.stub().callsArgWith 2, null
-
- it "should not call update if there are no bonuses to apply", (done)->
- @ReferalAllocator.assignBonus @user_id, (err)=>
- @User.update.called.should.equal false
- done()
-
- describe "when the user has better features already", ->
-
- beforeEach ->
- @refered_user_count = 3
- @stubbedUser =
- refered_user_count:4
- features:
- collaborators:3
- dropbox:false
- versioning:false
- @Settings.bonus_features =
- "4":
- collaborators: 10
- dropbox: true
- versioning: false
-
- @User.findOne = sinon.stub().callsArgWith 1, null, @stubbedUser
- @User.update = sinon.stub().callsArgWith 2, null
-
- it "should not set in in mongo when the feature is better", (done)->
- @ReferalAllocator.assignBonus @user_id, =>
- @User.update.calledWith({_id: @user_id }, {$set: features:{dropbox:true, versioning:false, collaborators:10} }).should.equal true
- done()
-
- it "should not overright if the user has -1 users", (done)->
- @stubbedUser.features.collaborators = -1
- @ReferalAllocator.assignBonus @user_id, =>
- @User.update.calledWith({_id: @user_id }, {$set: features:{dropbox:true, versioning:false, collaborators:-1} }).should.equal true
- done()
-
- describe "when the user is not at a bonus level", ->
- beforeEach ->
- @refered_user_count = 0
- @Settings.bonus_features =
- "1":
- collaborators: 3
- dropbox: false
- versioning: false
- @User.findOne = sinon.stub().callsArgWith 1, null, { refered_user_count: @refered_user_count }
- @User.update = sinon.stub().callsArgWith 2, null
- @ReferalAllocator.assignBonus @user_id, @callback
-
- it "should get the users number of refered user", ->
- @User.findOne
- .calledWith(_id: @user_id)
- .should.equal true
-
- it "should not update the user to bonus features", ->
- @User.update.called.should.equal false
-
- it "should call the callback", ->
- @callback.called.should.equal true
-
-
diff --git a/services/web/test/unit/coffee/Referal/ReferalFeaturesTests.coffee b/services/web/test/unit/coffee/Referal/ReferalFeaturesTests.coffee
new file mode 100644
index 0000000000..dfa70f8ebe
--- /dev/null
+++ b/services/web/test/unit/coffee/Referal/ReferalFeaturesTests.coffee
@@ -0,0 +1,65 @@
+SandboxedModule = require('sandboxed-module')
+assert = require('assert')
+require('chai').should()
+sinon = require('sinon')
+modulePath = require('path').join __dirname, '../../../../app/js/Features/Referal/ReferalFeatures.js'
+
+describe 'ReferalFeatures', ->
+
+ beforeEach ->
+ @ReferalFeatures = SandboxedModule.require modulePath, requires:
+ '../../models/User': User: @User = {}
+ "settings-sharelatex": @Settings = {}
+ 'logger-sharelatex':
+ log:->
+ err:->
+ @callback = sinon.stub()
+ @referal_id = "referal-id-123"
+ @referal_medium = "twitter"
+ @user_id = "user-id-123"
+ @new_user_id = "new-user-id-123"
+
+ describe "getBonusFeatures", ->
+ beforeEach ->
+ @refered_user_count = 3
+ @Settings.bonus_features =
+ "3":
+ collaborators: 3
+ dropbox: false
+ versioning: false
+ stubbedUser = {
+ refered_user_count: @refered_user_count,
+ features:{collaborators:1, dropbox:false, versioning:false}
+ }
+
+ @User.findOne = sinon.stub().callsArgWith 1, null, stubbedUser
+ @ReferalFeatures.getBonusFeatures @user_id, @callback
+
+ it "should get the users number of refered user", ->
+ @User.findOne
+ .calledWith(_id: @user_id)
+ .should.equal true
+
+ it "should call the callback with the features", ->
+ @callback.calledWith(null, @Settings.bonus_features[3]).should.equal true
+
+ describe "when the user is not at a bonus level", ->
+ beforeEach ->
+ @refered_user_count = 0
+ @Settings.bonus_features =
+ "1":
+ collaborators: 3
+ dropbox: false
+ versioning: false
+ @User.findOne = sinon.stub().callsArgWith 1, null, { refered_user_count: @refered_user_count }
+ @ReferalFeatures.getBonusFeatures @user_id, @callback
+
+ it "should get the users number of refered user", ->
+ @User.findOne
+ .calledWith(_id: @user_id)
+ .should.equal true
+
+ it "should call the callback with no features", ->
+ @callback.calledWith(null, {}).should.equal true
+
+
diff --git a/services/web/test/unit/coffee/References/ReferencesHandlerTests.coffee b/services/web/test/unit/coffee/References/ReferencesHandlerTests.coffee
index c69cb3ee0a..9ca565b24d 100644
--- a/services/web/test/unit/coffee/References/ReferencesHandlerTests.coffee
+++ b/services/web/test/unit/coffee/References/ReferencesHandlerTests.coffee
@@ -385,3 +385,13 @@ describe 'ReferencesHandler', ->
@call (err, isFullIndex) =>
expect(err).to.equal null
expect(isFullIndex).to.equal false
+
+ describe 'with referencesSearch', ->
+
+ beforeEach ->
+ @owner.features = {referencesSearch: true, references: false}
+
+ it 'should return true', ->
+ @call (err, isFullIndex) =>
+ expect(err).to.equal null
+ expect(isFullIndex).to.equal true
diff --git a/services/web/test/unit/coffee/Subscription/FeaturesUpdaterTests.coffee b/services/web/test/unit/coffee/Subscription/FeaturesUpdaterTests.coffee
new file mode 100644
index 0000000000..c8f77bfd40
--- /dev/null
+++ b/services/web/test/unit/coffee/Subscription/FeaturesUpdaterTests.coffee
@@ -0,0 +1,173 @@
+SandboxedModule = require('sandboxed-module')
+should = require('chai').should()
+expect = require('chai').expect
+sinon = require 'sinon'
+modulePath = "../../../../app/js/Features/Subscription/FeaturesUpdater"
+assert = require("chai").assert
+ObjectId = require('mongoose').Types.ObjectId
+
+describe "FeaturesUpdater", ->
+
+ beforeEach ->
+ @user_id = ObjectId().toString()
+
+ @FeaturesUpdater = SandboxedModule.require modulePath, requires:
+ './UserFeaturesUpdater': @UserFeaturesUpdater = {}
+ './SubscriptionLocator': @SubscriptionLocator = {}
+ './PlansLocator': @PlansLocator = {}
+ "logger-sharelatex": log:->
+ 'settings-sharelatex': @Settings = {}
+ "../Referal/ReferalFeatures" : @ReferalFeatures = {}
+ "./V1SubscriptionManager": @V1SubscriptionManager = {}
+
+ describe "refreshFeatures", ->
+ beforeEach ->
+ @UserFeaturesUpdater.updateFeatures = sinon.stub().yields()
+ @FeaturesUpdater._getIndividualFeatures = sinon.stub().yields(null, { 'individual': 'features' })
+ @FeaturesUpdater._getGroupFeatureSets = sinon.stub().yields(null, [{ 'group': 'features' }, { 'group': 'features2' }])
+ @FeaturesUpdater._getV1Features = sinon.stub().yields(null, { 'v1': 'features' })
+ @ReferalFeatures.getBonusFeatures = sinon.stub().yields(null, { 'bonus': 'features' })
+ @FeaturesUpdater._mergeFeatures = sinon.stub().returns({'merged': 'features'})
+ @callback = sinon.stub()
+ @FeaturesUpdater.refreshFeatures @user_id, @callback
+
+ it "should get the individual features", ->
+ @FeaturesUpdater._getIndividualFeatures
+ .calledWith(@user_id)
+ .should.equal true
+
+ it "should get the group features", ->
+ @FeaturesUpdater._getGroupFeatureSets
+ .calledWith(@user_id)
+ .should.equal true
+
+ it "should get the v1 features", ->
+ @FeaturesUpdater._getV1Features
+ .calledWith(@user_id)
+ .should.equal true
+
+ it "should get the bonus features", ->
+ @ReferalFeatures.getBonusFeatures
+ .calledWith(@user_id)
+ .should.equal true
+
+ it "should merge from the default features", ->
+ @FeaturesUpdater._mergeFeatures.calledWith(@Settings.defaultFeatures).should.equal true
+
+ it "should merge the individual features", ->
+ @FeaturesUpdater._mergeFeatures.calledWith(sinon.match.any, { 'individual': 'features' }).should.equal true
+
+ it "should merge the group features", ->
+ @FeaturesUpdater._mergeFeatures.calledWith(sinon.match.any, { 'group': 'features' }).should.equal true
+ @FeaturesUpdater._mergeFeatures.calledWith(sinon.match.any, { 'group': 'features2' }).should.equal true
+
+ it "should merge the v1 features", ->
+ @FeaturesUpdater._mergeFeatures.calledWith(sinon.match.any, { 'v1': 'features' }).should.equal true
+
+ it "should merge the bonus features", ->
+ @FeaturesUpdater._mergeFeatures.calledWith(sinon.match.any, { 'bonus': 'features' }).should.equal true
+
+ it "should update the user with the merged features", ->
+ @UserFeaturesUpdater.updateFeatures
+ .calledWith(@user_id, {'merged': 'features'})
+ .should.equal true
+
+ describe "_mergeFeatures", ->
+ it "should prefer priority over standard for compileGroup", ->
+ expect(@FeaturesUpdater._mergeFeatures({
+ compileGroup: 'priority'
+ }, {
+ compileGroup: 'standard'
+ })).to.deep.equal({
+ compileGroup: 'priority'
+ })
+ expect(@FeaturesUpdater._mergeFeatures({
+ compileGroup: 'standard'
+ }, {
+ compileGroup: 'priority'
+ })).to.deep.equal({
+ compileGroup: 'priority'
+ })
+ expect(@FeaturesUpdater._mergeFeatures({
+ compileGroup: 'priority'
+ }, {
+ compileGroup: 'priority'
+ })).to.deep.equal({
+ compileGroup: 'priority'
+ })
+ expect(@FeaturesUpdater._mergeFeatures({
+ compileGroup: 'standard'
+ }, {
+ compileGroup: 'standard'
+ })).to.deep.equal({
+ compileGroup: 'standard'
+ })
+
+ it "should prefer -1 over any other for collaborators", ->
+ expect(@FeaturesUpdater._mergeFeatures({
+ collaborators: -1
+ }, {
+ collaborators: 10
+ })).to.deep.equal({
+ collaborators: -1
+ })
+ expect(@FeaturesUpdater._mergeFeatures({
+ collaborators: 10
+ }, {
+ collaborators: -1
+ })).to.deep.equal({
+ collaborators: -1
+ })
+ expect(@FeaturesUpdater._mergeFeatures({
+ collaborators: 4
+ }, {
+ collaborators: 10
+ })).to.deep.equal({
+ collaborators: 10
+ })
+
+ it "should prefer the higher of compileTimeout", ->
+ expect(@FeaturesUpdater._mergeFeatures({
+ compileTimeout: 20
+ }, {
+ compileTimeout: 10
+ })).to.deep.equal({
+ compileTimeout: 20
+ })
+ expect(@FeaturesUpdater._mergeFeatures({
+ compileTimeout: 10
+ }, {
+ compileTimeout: 20
+ })).to.deep.equal({
+ compileTimeout: 20
+ })
+
+ it "should prefer the true over false for other keys", ->
+ expect(@FeaturesUpdater._mergeFeatures({
+ github: true
+ }, {
+ github: false
+ })).to.deep.equal({
+ github: true
+ })
+ expect(@FeaturesUpdater._mergeFeatures({
+ github: false
+ }, {
+ github: true
+ })).to.deep.equal({
+ github: true
+ })
+ expect(@FeaturesUpdater._mergeFeatures({
+ github: true
+ }, {
+ github: true
+ })).to.deep.equal({
+ github: true
+ })
+ expect(@FeaturesUpdater._mergeFeatures({
+ github: false
+ }, {
+ github: false
+ })).to.deep.equal({
+ github: false
+ })
diff --git a/services/web/test/unit/coffee/Subscription/SubscriptionControllerTests.coffee b/services/web/test/unit/coffee/Subscription/SubscriptionControllerTests.coffee
index 22f571ffa8..04888e2dd7 100644
--- a/services/web/test/unit/coffee/Subscription/SubscriptionControllerTests.coffee
+++ b/services/web/test/unit/coffee/Subscription/SubscriptionControllerTests.coffee
@@ -75,6 +75,7 @@ describe "SubscriptionController", ->
"./SubscriptionDomainHandler":@SubscriptionDomainHandler
"../User/UserGetter": @UserGetter
"./RecurlyWrapper": @RecurlyWrapper = {}
+ "./FeaturesUpdater": @FeaturesUpdater = {}
@res = new MockResponse()
diff --git a/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee b/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee
index 1daf43bbd7..bca9ac7600 100644
--- a/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee
+++ b/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee
@@ -24,18 +24,15 @@ describe "SubscriptionGroupHandler", ->
getSubscriptionByMemberIdAndId: sinon.stub()
getSubscription: sinon.stub()
- @UserCreator =
- getUserOrCreateHoldingAccount: sinon.stub().callsArgWith(1, null, @user)
-
@SubscriptionUpdater =
addUserToGroup: sinon.stub().callsArgWith(2)
removeUserFromGroup: sinon.stub().callsArgWith(2)
addEmailInviteToGroup: sinon.stub().callsArgWith(2)
removeEmailInviteFromGroup: sinon.stub().callsArgWith(2)
- @UserLocator =
- findById: sinon.stub()
- findByEmail: sinon.stub()
+ @UserGetter =
+ getUser: sinon.stub()
+ getUserByMainEmail: sinon.stub()
@LimitationsManager =
hasGroupMembersLimitReached: sinon.stub()
@@ -59,7 +56,7 @@ describe "SubscriptionGroupHandler", ->
"../User/UserCreator": @UserCreator
"./SubscriptionUpdater": @SubscriptionUpdater
"./SubscriptionLocator": @SubscriptionLocator
- "../User/UserLocator": @UserLocator
+ "../User/UserGetter": @UserGetter
"./LimitationsManager": @LimitationsManager
"../Security/OneTimeTokenHandler":@OneTimeTokenHandler
"../Email/EmailHandler":@EmailHandler
@@ -74,11 +71,11 @@ describe "SubscriptionGroupHandler", ->
describe "addUserToGroup", ->
beforeEach ->
@LimitationsManager.hasGroupMembersLimitReached.callsArgWith(1, null, false, @subscription)
- @UserLocator.findByEmail.callsArgWith(1, null, @user)
+ @UserGetter.getUserByMainEmail.callsArgWith(1, null, @user)
it "should find the user", (done)->
@Handler.addUserToGroup @adminUser_id, @newEmail, (err)=>
- @UserLocator.findByEmail.calledWith(@newEmail).should.equal true
+ @UserGetter.getUserByMainEmail.calledWith(@newEmail).should.equal true
done()
it "should add the user to the group", (done)->
@@ -105,7 +102,7 @@ describe "SubscriptionGroupHandler", ->
done()
it "should add an email invite if no user is found", (done) ->
- @UserLocator.findByEmail.callsArgWith(1, null, null)
+ @UserGetter.getUserByMainEmail.callsArgWith(1, null, null)
@Handler.addUserToGroup @adminUser_id, @newEmail, (err)=>
@SubscriptionUpdater.addEmailInviteToGroup.calledWith(@adminUser_id, @newEmail).should.equal true
done()
@@ -122,26 +119,26 @@ describe "SubscriptionGroupHandler", ->
beforeEach ->
@subscription = {}
@SubscriptionLocator.getUsersSubscription.callsArgWith(1, null, @subscription)
- @UserLocator.findById.callsArgWith(1, null, {_id:"31232"})
+ @UserGetter.getUser.callsArgWith(1, null, {_id:"31232"})
it "should locate the subscription", (done)->
- @UserLocator.findById.callsArgWith(1, null, {_id:"31232"})
+ @UserGetter.getUser.callsArgWith(1, null, {_id:"31232"})
@Handler.getPopulatedListOfMembers @adminUser_id, (err, users)=>
@SubscriptionLocator.getUsersSubscription.calledWith(@adminUser_id).should.equal true
done()
it "should get the users by id", (done)->
- @UserLocator.findById.callsArgWith(1, null, {_id:"31232"})
+ @UserGetter.getUser.callsArgWith(1, null, {_id:"31232"})
@subscription.member_ids = ["1234", "342432", "312312"]
@Handler.getPopulatedListOfMembers @adminUser_id, (err, users)=>
- @UserLocator.findById.calledWith(@subscription.member_ids[0]).should.equal true
- @UserLocator.findById.calledWith(@subscription.member_ids[1]).should.equal true
- @UserLocator.findById.calledWith(@subscription.member_ids[2]).should.equal true
+ @UserGetter.getUser.calledWith(@subscription.member_ids[0]).should.equal true
+ @UserGetter.getUser.calledWith(@subscription.member_ids[1]).should.equal true
+ @UserGetter.getUser.calledWith(@subscription.member_ids[2]).should.equal true
users.length.should.equal @subscription.member_ids.length
done()
it "should just return the id if the user can not be found as they may have deleted their account", (done)->
- @UserLocator.findById.callsArgWith(1)
+ @UserGetter.getUser.callsArgWith(1)
@subscription.member_ids = ["1234", "342432", "312312"]
@Handler.getPopulatedListOfMembers @adminUser_id, (err, users)=>
assert.deepEqual users[0], {_id:@subscription.member_ids[0]}
diff --git a/services/web/test/unit/coffee/Subscription/SubscriptionUpdaterTests.coffee b/services/web/test/unit/coffee/Subscription/SubscriptionUpdaterTests.coffee
index 93479a03a1..dd2afad56b 100644
--- a/services/web/test/unit/coffee/Subscription/SubscriptionUpdaterTests.coffee
+++ b/services/web/test/unit/coffee/Subscription/SubscriptionUpdaterTests.coffee
@@ -1,5 +1,6 @@
SandboxedModule = require('sandboxed-module')
should = require('chai').should()
+expect = require('chai').expect
sinon = require 'sinon'
modulePath = "../../../../app/js/Features/Subscription/SubscriptionUpdater"
assert = require("chai").assert
@@ -22,6 +23,7 @@ describe "SubscriptionUpdater", ->
save: sinon.stub().callsArgWith(0)
freeTrial:{}
planCode:"student_or_something"
+ @user_id = @adminuser_id
@groupSubscription =
admin_id: @adminUser._id
@@ -48,15 +50,15 @@ describe "SubscriptionUpdater", ->
@Settings =
freeTrialPlanCode: "collaborator"
defaultPlanCode: "personal"
+ defaultFeatures: { "default": "features" }
@UserFeaturesUpdater =
- updateFeatures : sinon.stub().callsArgWith(2)
+ updateFeatures : sinon.stub().yields()
@PlansLocator =
findLocalPlanInSettings: sinon.stub().returns({})
- @ReferalAllocator = assignBonus:sinon.stub().callsArgWith(1)
- @ReferalAllocator.cock = true
+ @ReferalFeatures = getBonusFeatures: sinon.stub().callsArgWith(1)
@Modules = {hooks: {fire: sinon.stub().callsArgWith(2, null, null)}}
@SubscriptionUpdater = SandboxedModule.require modulePath, requires:
'../../models/Subscription': Subscription:@SubscriptionModel
@@ -65,8 +67,7 @@ describe "SubscriptionUpdater", ->
'./PlansLocator': @PlansLocator
"logger-sharelatex": log:->
'settings-sharelatex': @Settings
- "../Referal/ReferalAllocator" : @ReferalAllocator
- '../../infrastructure/Modules': @Modules
+ "./FeaturesUpdater": @FeaturesUpdater = {}
describe "syncSubscription", ->
@@ -97,7 +98,7 @@ describe "SubscriptionUpdater", ->
describe "_updateSubscriptionFromRecurly", ->
beforeEach ->
- @SubscriptionUpdater._setUsersMinimumFeatures = sinon.stub().callsArgWith(1)
+ @FeaturesUpdater.refreshFeatures = sinon.stub().callsArgWith(1)
it "should update the subscription with token etc when not expired", (done)->
@SubscriptionUpdater._updateSubscriptionFromRecurly @recurlySubscription, @subscription, (err)=>
@@ -108,7 +109,7 @@ describe "SubscriptionUpdater", ->
assert.equal(@subscription.freeTrial.expiresAt, undefined)
assert.equal(@subscription.freeTrial.planCode, undefined)
@subscription.save.called.should.equal true
- @SubscriptionUpdater._setUsersMinimumFeatures.calledWith(@adminUser._id).should.equal true
+ @FeaturesUpdater.refreshFeatures.calledWith(@adminUser._id).should.equal true
done()
it "should remove the recurlySubscription_id when expired", (done)->
@@ -117,15 +118,15 @@ describe "SubscriptionUpdater", ->
@SubscriptionUpdater._updateSubscriptionFromRecurly @recurlySubscription, @subscription, (err)=>
assert.equal(@subscription.recurlySubscription_id, undefined)
@subscription.save.called.should.equal true
- @SubscriptionUpdater._setUsersMinimumFeatures.calledWith(@adminUser._id).should.equal true
+ @FeaturesUpdater.refreshFeatures.calledWith(@adminUser._id).should.equal true
done()
it "should update all the users features", (done)->
@SubscriptionUpdater._updateSubscriptionFromRecurly @recurlySubscription, @subscription, (err)=>
- @SubscriptionUpdater._setUsersMinimumFeatures.calledWith(@adminUser._id).should.equal true
- @SubscriptionUpdater._setUsersMinimumFeatures.calledWith(@allUserIds[0]).should.equal true
- @SubscriptionUpdater._setUsersMinimumFeatures.calledWith(@allUserIds[1]).should.equal true
- @SubscriptionUpdater._setUsersMinimumFeatures.calledWith(@allUserIds[2]).should.equal true
+ @FeaturesUpdater.refreshFeatures.calledWith(@adminUser._id).should.equal true
+ @FeaturesUpdater.refreshFeatures.calledWith(@allUserIds[0]).should.equal true
+ @FeaturesUpdater.refreshFeatures.calledWith(@allUserIds[1]).should.equal true
+ @FeaturesUpdater.refreshFeatures.calledWith(@allUserIds[2]).should.equal true
done()
it "should set group to true and save how many members can be added to group", (done)->
@@ -152,6 +153,9 @@ describe "SubscriptionUpdater", ->
done()
describe "addUserToGroup", ->
+ beforeEach ->
+ @FeaturesUpdater.refreshFeatures = sinon.stub().callsArgWith(1)
+
it "should add the users id to the group as a set", (done)->
@SubscriptionUpdater.addUserToGroup @adminUser._id, @otherUserId, =>
searchOps =
@@ -163,12 +167,12 @@ describe "SubscriptionUpdater", ->
it "should update the users features", (done)->
@SubscriptionUpdater.addUserToGroup @adminUser._id, @otherUserId, =>
- @UserFeaturesUpdater.updateFeatures.calledWith(@otherUserId, @subscription.planCode).should.equal true
+ @FeaturesUpdater.refreshFeatures.calledWith(@otherUserId).should.equal true
done()
describe "removeUserFromGroup", ->
beforeEach ->
- @SubscriptionUpdater._setUsersMinimumFeatures = sinon.stub().callsArgWith(1)
+ @FeaturesUpdater.refreshFeatures = sinon.stub().callsArgWith(1)
it "should pull the users id from the group", (done)->
@SubscriptionUpdater.removeUserFromGroup @adminUser._id, @otherUserId, =>
@@ -181,69 +185,7 @@ describe "SubscriptionUpdater", ->
it "should update the users features", (done)->
@SubscriptionUpdater.removeUserFromGroup @adminUser._id, @otherUserId, =>
- @SubscriptionUpdater._setUsersMinimumFeatures.calledWith(@otherUserId).should.equal true
- done()
-
- describe "_setUsersMinimumFeatures", ->
-
- it "should call updateFeatures with the subscription if set", (done)->
- @SubscriptionLocator.getUsersSubscription.callsArgWith(1, null, @subscription)
- @SubscriptionLocator.getGroupSubscriptionMemberOf.callsArgWith(1, null)
-
- @SubscriptionUpdater._setUsersMinimumFeatures @adminUser._id, (err)=>
- args = @UserFeaturesUpdater.updateFeatures.args[0]
- assert.equal args[0], @adminUser._id
- assert.equal args[1], @subscription.planCode
- done()
-
- it "should call updateFeatures with the group subscription if set", (done)->
- @SubscriptionLocator.getUsersSubscription.callsArgWith(1, null)
- @SubscriptionLocator.getGroupSubscriptionMemberOf.callsArgWith(1, null, @groupSubscription)
-
- @SubscriptionUpdater._setUsersMinimumFeatures @adminUser._id, (err)=>
- args = @UserFeaturesUpdater.updateFeatures.args[0]
- assert.equal args[0], @adminUser._id
- assert.equal args[1], @groupSubscription.planCode
- done()
-
- it "should call updateFeatures with the overleaf subscription if set", (done)->
- @SubscriptionLocator.getUsersSubscription.callsArgWith(1, null)
- @SubscriptionLocator.getGroupSubscriptionMemberOf.callsArgWith(1, null, null)
- @Modules.hooks.fire = sinon.stub().callsArgWith(2, null, ['ol_pro'])
-
- @SubscriptionUpdater._setUsersMinimumFeatures @adminUser._id, (err)=>
- args = @UserFeaturesUpdater.updateFeatures.args[0]
- assert.equal args[0], @adminUser._id
- assert.equal args[1], 'ol_pro'
- done()
-
- it "should call not call updateFeatures with users subscription if the subscription plan code is the default one (downgraded)", (done)->
- @subscription.planCode = @Settings.defaultPlanCode
- @SubscriptionLocator.getUsersSubscription.callsArgWith(1, null, @subscription)
- @SubscriptionLocator.getGroupSubscriptionMemberOf.callsArgWith(1, null, @groupSubscription)
- @Modules.hooks.fire = sinon.stub().callsArgWith(2, null, null)
- @SubscriptionUpdater._setUsersMinimumFeatures @adminuser_id, (err)=>
- args = @UserFeaturesUpdater.updateFeatures.args[0]
- assert.equal args[0], @adminUser._id
- assert.equal args[1], @groupSubscription.planCode
- done()
-
-
- it "should call updateFeatures with default if there are no subscriptions for user", (done)->
- @SubscriptionLocator.getUsersSubscription.callsArgWith(1, null)
- @SubscriptionLocator.getGroupSubscriptionMemberOf.callsArgWith(1, null)
- @Modules.hooks.fire = sinon.stub().callsArgWith(2, null, null)
- @SubscriptionUpdater._setUsersMinimumFeatures @adminuser_id, (err)=>
- args = @UserFeaturesUpdater.updateFeatures.args[0]
- assert.equal args[0], @adminUser._id
- assert.equal args[1], @Settings.defaultPlanCode
- done()
-
- it "should call assignBonus", (done)->
- @SubscriptionLocator.getUsersSubscription.callsArgWith(1, null)
- @SubscriptionLocator.getGroupSubscriptionMemberOf.callsArgWith(1, null)
- @SubscriptionUpdater._setUsersMinimumFeatures @adminuser_id, (err)=>
- @ReferalAllocator.assignBonus.calledWith(@adminuser_id).should.equal true
+ @FeaturesUpdater.refreshFeatures.calledWith(@otherUserId).should.equal true
done()
describe "deleteSubscription", ->
@@ -255,7 +197,7 @@ describe "SubscriptionUpdater", ->
member_ids: [ ObjectId(), ObjectId(), ObjectId() ]
}
@SubscriptionLocator.getSubscription = sinon.stub().yields(null, @subscription)
- @SubscriptionUpdater._setUsersMinimumFeatures = sinon.stub().yields()
+ @FeaturesUpdater.refreshFeatures = sinon.stub().yields()
@SubscriptionUpdater.deleteSubscription @subscription_id, done
it "should look up the subscription", ->
@@ -269,22 +211,12 @@ describe "SubscriptionUpdater", ->
.should.equal true
it "should downgrade the admin_id", ->
- @SubscriptionUpdater._setUsersMinimumFeatures
+ @FeaturesUpdater.refreshFeatures
.calledWith(@subscription.admin_id)
.should.equal true
it "should downgrade all of the members", ->
for user_id in @subscription.member_ids
- @SubscriptionUpdater._setUsersMinimumFeatures
+ @FeaturesUpdater.refreshFeatures
.calledWith(user_id)
.should.equal true
-
- describe 'refreshSubscription', ->
- beforeEach ->
- @SubscriptionUpdater._setUsersMinimumFeatures = sinon.stub()
- .callsArgWith(1, null)
-
- it 'should call to _setUsersMinimumFeatures', ->
- @SubscriptionUpdater.refreshSubscription(@adminUser._id, ()->)
- @SubscriptionUpdater._setUsersMinimumFeatures.callCount.should.equal 1
- @SubscriptionUpdater._setUsersMinimumFeatures.calledWith(@adminUser._id).should.equal true
diff --git a/services/web/test/unit/coffee/Subscription/UserFeaturesUpdaterTests.coffee b/services/web/test/unit/coffee/Subscription/UserFeaturesUpdaterTests.coffee
index d388d67c3b..1ba4e0b32f 100644
--- a/services/web/test/unit/coffee/Subscription/UserFeaturesUpdaterTests.coffee
+++ b/services/web/test/unit/coffee/Subscription/UserFeaturesUpdaterTests.coffee
@@ -4,31 +4,20 @@ sinon = require 'sinon'
modulePath = "../../../../app/js/Features/Subscription/UserFeaturesUpdater"
assert = require("chai").assert
-
describe "UserFeaturesUpdater", ->
-
beforeEach ->
-
@User =
update: sinon.stub().callsArgWith(2)
-
- @PlansLocator =
- findLocalPlanInSettings : sinon.stub()
-
@UserFeaturesUpdater = SandboxedModule.require modulePath, requires:
'../../models/User': User:@User
"logger-sharelatex": log:->
- './PlansLocator': @PlansLocator
describe "updateFeatures", ->
-
it "should send the users features", (done)->
user_id = "5208dd34438842e2db000005"
- plan_code = "student"
- @features = features:{versioning:true, collaborators:10}
- @PlansLocator.findLocalPlanInSettings = sinon.stub().returns(@features)
- @UserFeaturesUpdater.updateFeatures user_id, plan_code, (err, features)=>
+ @features = {versioning:true, collaborators:10}
+ @UserFeaturesUpdater.updateFeatures user_id, @features, (err, features)=>
update = {"features.versioning":true, "features.collaborators":10}
@User.update.calledWith({"_id":user_id}, update).should.equal true
- features.should.deep.equal @features.features
+ features.should.deep.equal @features
done()
\ No newline at end of file
diff --git a/services/web/test/unit/coffee/Subscription/V1SusbcriptionManagerTests.coffee b/services/web/test/unit/coffee/Subscription/V1SusbcriptionManagerTests.coffee
new file mode 100644
index 0000000000..ae6237e627
--- /dev/null
+++ b/services/web/test/unit/coffee/Subscription/V1SusbcriptionManagerTests.coffee
@@ -0,0 +1,128 @@
+should = require('chai').should()
+SandboxedModule = require('sandboxed-module')
+assert = require('assert')
+path = require('path')
+modulePath = path.join __dirname, '../../../../app/js/Features/Subscription/V1SubscriptionManager'
+sinon = require("sinon")
+expect = require("chai").expect
+
+
+describe 'V1SubscriptionManager', ->
+ beforeEach ->
+ @V1SubscriptionManager = SandboxedModule.require modulePath, requires:
+ "../User/UserGetter": @UserGetter = {}
+ "logger-sharelatex":
+ log: sinon.stub()
+ err: sinon.stub()
+ warn: sinon.stub()
+ "settings-sharelatex":
+ overleaf:
+ host: @host = "http://overleaf.example.com"
+ "request": @request = sinon.stub()
+ @V1SubscriptionManager._v1PlanRequest = sinon.stub()
+ @userId = 'abcd'
+ @v1UserId = 42
+ @user =
+ _id: @userId
+ email: 'user@example.com'
+ overleaf:
+ id: @v1UserId
+
+ describe 'getPlanCodeFromV1', ->
+ beforeEach ->
+ @responseBody =
+ id: 32,
+ plan_name: 'pro'
+ @UserGetter.getUser = sinon.stub()
+ .yields(null, @user)
+ @V1SubscriptionManager._v1PlanRequest = sinon.stub()
+ .yields(null, @responseBody)
+ @call = (cb) =>
+ @V1SubscriptionManager.getPlanCodeFromV1 @userId, cb
+
+ describe 'when all goes well', ->
+
+ it 'should call getUser', (done) ->
+ @call (err, planCode) =>
+ expect(
+ @UserGetter.getUser.callCount
+ ).to.equal 1
+ expect(
+ @UserGetter.getUser.calledWith(@userId)
+ ).to.equal true
+ done()
+
+ it 'should call _v1PlanRequest', (done) ->
+ @call (err, planCode) =>
+ expect(
+ @V1SubscriptionManager._v1PlanRequest.callCount
+ ).to.equal 1
+ expect(
+ @V1SubscriptionManager._v1PlanRequest.calledWith(
+ @v1UserId
+ )
+ ).to.equal true
+ done()
+
+ it 'should produce a plan-code without error', (done) ->
+ @call (err, planCode) =>
+ expect(err).to.not.exist
+ expect(planCode).to.equal 'v1_pro'
+ done()
+
+ describe 'when the plan_name from v1 is null', ->
+ beforeEach ->
+ @responseBody.plan_name = null
+
+ it 'should produce a null plan-code without error', (done) ->
+ @call (err, planCode) =>
+ expect(err).to.not.exist
+ expect(planCode).to.equal null
+ done()
+
+ describe 'when getUser produces an error', ->
+ beforeEach ->
+ @UserGetter.getUser = sinon.stub()
+ .yields(new Error('woops'))
+
+ it 'should not call _v1PlanRequest', (done) ->
+ @call (err, planCode) =>
+ expect(
+ @V1SubscriptionManager._v1PlanRequest.callCount
+ ).to.equal 0
+ done()
+
+ it 'should produce an error', (done) ->
+ @call (err, planCode) =>
+ expect(err).to.exist
+ expect(planCode).to.not.exist
+ done()
+
+ describe 'when getUser does not find a user', ->
+ beforeEach ->
+ @UserGetter.getUser = sinon.stub()
+ .yields(null, null)
+
+ it 'should not call _v1PlanRequest', (done) ->
+ @call (err, planCode) =>
+ expect(
+ @V1SubscriptionManager._v1PlanRequest.callCount
+ ).to.equal 0
+ done()
+
+ it 'should produce a null plan-code, without error', (done) ->
+ @call (err, planCode) =>
+ expect(err).to.not.exist
+ expect(planCode).to.not.exist
+ done()
+
+ describe 'when the request to v1 fails', ->
+ beforeEach ->
+ @V1SubscriptionManager._v1PlanRequest = sinon.stub()
+ .yields(new Error('woops'))
+
+ it 'should produce an error', (done) ->
+ @call (err, planCode) =>
+ expect(err).to.exist
+ expect(planCode).to.not.exist
+ done()
diff --git a/services/web/test/unit/coffee/Uploads/FileTypeManagerTests.coffee b/services/web/test/unit/coffee/Uploads/FileTypeManagerTests.coffee
index c6fdf64829..be456c74a5 100644
--- a/services/web/test/unit/coffee/Uploads/FileTypeManagerTests.coffee
+++ b/services/web/test/unit/coffee/Uploads/FileTypeManagerTests.coffee
@@ -39,7 +39,7 @@ describe "FileTypeManager", ->
beforeEach ->
@stat = { size: 100 }
@fs.stat = sinon.stub().callsArgWith(1, null, @stat)
-
+
it "should return .tex files as not binary", ->
@FileTypeManager.isBinary "file.tex", "/path/on/disk", (error, binary) ->
binary.should.equal false
@@ -80,10 +80,18 @@ describe "FileTypeManager", ->
@FileTypeManager.isBinary "tex", "/path/on/disk", (error, binary) ->
binary.should.equal true
+ it "should return .latexmkrc file as not binary", ->
+ @FileTypeManager.isBinary ".latexmkrc", "/path/on/disk", (error, binary) ->
+ binary.should.equal false
+
+ it "should return latexmkrc file as not binary", ->
+ @FileTypeManager.isBinary "latexmkrc", "/path/on/disk", (error, binary) ->
+ binary.should.equal false
+
it "should ignore the case of an extension", ->
@FileTypeManager.isBinary "file.TEX", "/path/on/disk", (error, binary) ->
binary.should.equal false
-
+
it "should return large text files as binary", ->
@stat.size = 2 * 1024 * 1024 # 2Mb
@FileTypeManager.isBinary "file.tex", "/path/on/disk", (error, binary) ->
@@ -98,6 +106,10 @@ describe "FileTypeManager", ->
@FileTypeManager.shouldIgnore "path/.git", (error, ignore) ->
ignore.should.equal true
+ it "should not ignore .latexmkrc dotfile", ->
+ @FileTypeManager.shouldIgnore "path/.latexmkrc", (error, ignore) ->
+ ignore.should.equal false
+
it "should ignore __MACOSX", ->
@FileTypeManager.shouldIgnore "path/__MACOSX", (error, ignore) ->
ignore.should.equal true
@@ -109,5 +121,3 @@ describe "FileTypeManager", ->
it "should ignore the case of the extension", ->
@FileTypeManager.shouldIgnore "file.AUX", (error, ignore) ->
ignore.should.equal true
-
-
diff --git a/services/web/test/unit/coffee/User/UserControllerTests.coffee b/services/web/test/unit/coffee/User/UserControllerTests.coffee
index c358f35b22..e815d8d701 100644
--- a/services/web/test/unit/coffee/User/UserControllerTests.coffee
+++ b/services/web/test/unit/coffee/User/UserControllerTests.coffee
@@ -30,8 +30,8 @@ describe "UserController", ->
@UserDeleter =
deleteUser: sinon.stub().callsArgWith(1)
- @UserLocator =
- findById: sinon.stub().callsArgWith(1, null, @user)
+ @UserGetter =
+ getUser: sinon.stub().callsArgWith(1, null, @user)
@User =
findById: sinon.stub().callsArgWith(1, null, @user)
@NewsLetterManager =
@@ -63,7 +63,7 @@ describe "UserController", ->
@SudoModeHandler =
clearSudoMode: sinon.stub()
@UserController = SandboxedModule.require modulePath, requires:
- "./UserLocator": @UserLocator
+ "./UserGetter": @UserGetter
"./UserDeleter": @UserDeleter
"./UserUpdater":@UserUpdater
"../../models/User": User:@User
diff --git a/services/web/test/unit/coffee/User/UserCreatorTests.coffee b/services/web/test/unit/coffee/User/UserCreatorTests.coffee
index 8470e5621f..cc2b1ec150 100644
--- a/services/web/test/unit/coffee/User/UserCreatorTests.coffee
+++ b/services/web/test/unit/coffee/User/UserCreatorTests.coffee
@@ -15,34 +15,16 @@ describe "UserCreator", ->
constructor: ->
return self.user
- @UserLocator =
- findByEmail: sinon.stub()
+ @UserGetter =
+ getUserByMainEmail: sinon.stub()
@UserCreator = SandboxedModule.require modulePath, requires:
"../../models/User": User:@UserModel
- "./UserLocator":@UserLocator
+ "./UserGetter":@UserGetter
"logger-sharelatex":{log:->}
'metrics-sharelatex': {timeAsyncMethod: ()->}
@email = "bob.oswald@gmail.com"
-
- describe "getUserOrCreateHoldingAccount", ->
-
- it "should immediately return the user if found", (done)->
- @UserLocator.findByEmail.callsArgWith(1, null, @user)
- @UserCreator.getUserOrCreateHoldingAccount @email, (err, returnedUser)=>
- assert.deepEqual returnedUser, @user
- done()
-
- it "should create new holding account if the user is not found", (done)->
- @UserLocator.findByEmail.callsArgWith(1)
- @UserCreator.createNewUser = sinon.stub().callsArgWith(1, null, @user)
- @UserCreator.getUserOrCreateHoldingAccount @email, (err, returnedUser)=>
- @UserCreator.createNewUser.calledWith(email:@email, holdingAccount:true).should.equal true
- assert.deepEqual returnedUser, @user
- done()
-
-
describe "createNewUser", ->
it "should take the opts and put them in the model", (done)->
diff --git a/services/web/test/unit/coffee/User/UserGetterTests.coffee b/services/web/test/unit/coffee/User/UserGetterTests.coffee
new file mode 100644
index 0000000000..2c32bd8250
--- /dev/null
+++ b/services/web/test/unit/coffee/User/UserGetterTests.coffee
@@ -0,0 +1,58 @@
+should = require('chai').should()
+SandboxedModule = require('sandboxed-module')
+assert = require('assert')
+path = require('path')
+sinon = require('sinon')
+modulePath = path.join __dirname, "../../../../app/js/Features/User/UserGetter"
+expect = require("chai").expect
+
+describe "UserGetter", ->
+
+ beforeEach ->
+ @fakeUser = {_id:"12390i"}
+ @findOne = sinon.stub().callsArgWith(2, null, @fakeUser)
+ @Mongo =
+ db: users: findOne: @findOne
+ ObjectId: (id) -> return id
+
+ @UserGetter = SandboxedModule.require modulePath, requires:
+ "logger-sharelatex": log:->
+ "../../infrastructure/mongojs": @Mongo
+ "metrics-sharelatex": timeAsyncMethod: sinon.stub()
+
+ describe "getUser", ->
+ it "should get user", (done)->
+ query = _id: 'foo'
+ projection = email: 1
+ @UserGetter.getUser query, projection, (error, user) =>
+ @findOne.called.should.equal true
+ @findOne.calledWith(query, projection).should.equal true
+ user.should.deep.equal @fakeUser
+ done()
+
+ it "should not allow email in query", (done)->
+ @UserGetter.getUser email: 'foo@bar.com', {}, (error, user) =>
+ error.should.exist
+ done()
+
+ describe "getUserbyMainEmail", ->
+ it "query user by main email", (done)->
+ email = 'hello@world.com'
+ projection = emails: 1
+ @UserGetter.getUserByMainEmail email, projection, (error, user) =>
+ @findOne.called.should.equal true
+ @findOne.calledWith(email: email, projection).should.equal true
+ done()
+
+ it "return user if found", (done)->
+ email = 'hello@world.com'
+ @UserGetter.getUserByMainEmail email, (error, user) =>
+ user.should.deep.equal @fakeUser
+ done()
+
+ it "trim email", (done)->
+ email = 'hello@world.com'
+ @UserGetter.getUserByMainEmail " #{email} ", (error, user) =>
+ @findOne.called.should.equal true
+ @findOne.calledWith(email: email).should.equal true
+ done()
diff --git a/services/web/test/unit/coffee/User/UserLocatorTests.coffee b/services/web/test/unit/coffee/User/UserLocatorTests.coffee
deleted file mode 100644
index dc3fc84dfa..0000000000
--- a/services/web/test/unit/coffee/User/UserLocatorTests.coffee
+++ /dev/null
@@ -1,39 +0,0 @@
-sinon = require('sinon')
-chai = require('chai')
-should = chai.should()
-modulePath = "../../../../app/js/Features/User/UserLocator.js"
-SandboxedModule = require('sandboxed-module')
-
-describe "UserLocator", ->
-
- beforeEach ->
- @user = {_id:"12390i"}
- @UserLocator = SandboxedModule.require modulePath, requires:
- "../../infrastructure/mongojs": db: @db = { users: {} }
- "metrics-sharelatex": timeAsyncMethod: sinon.stub()
- 'logger-sharelatex' : { log: sinon.stub() }
- @db.users =
- findOne : sinon.stub().callsArgWith(1, null, @user)
-
- @email = "bob.oswald@gmail.com"
-
-
- describe "findByEmail", ->
-
- it "should try and find a user with that email address", (done)->
- @UserLocator.findByEmail @email, (err, user)=>
- @db.users.findOne.calledWith(email:@email).should.equal true
- done()
-
- it "should trim white space", (done)->
- @UserLocator.findByEmail "#{@email} ", (err, user)=>
- @db.users.findOne.calledWith(email:@email).should.equal true
- done()
-
- it "should return the user if found", (done)->
- @UserLocator.findByEmail @email, (err, user)=>
- user.should.deep.equal @user
- done()
-
-
-
diff --git a/services/web/test/unit/coffee/User/UserPagesControllerTests.coffee b/services/web/test/unit/coffee/User/UserPagesControllerTests.coffee
index 529f5b1be6..a0f155846f 100644
--- a/services/web/test/unit/coffee/User/UserPagesControllerTests.coffee
+++ b/services/web/test/unit/coffee/User/UserPagesControllerTests.coffee
@@ -16,10 +16,7 @@ describe "UserPagesController", ->
features:{}
email: "joe@example.com"
- @UserLocator =
- findById: sinon.stub().callsArgWith(1, null, @user)
- @UserGetter =
- getUser: sinon.stub().callsArgWith(2, null, @user)
+ @UserGetter = getUser: sinon.stub()
@UserSessionsManager =
getAllUserSessions: sinon.stub()
@dropboxStatus = {}
@@ -37,7 +34,6 @@ describe "UserPagesController", ->
"logger-sharelatex":
log:->
err:->
- "./UserLocator": @UserLocator
"./UserGetter": @UserGetter
"./UserSessionsManager": @UserSessionsManager
"../Errors/ErrorController": @ErrorController
@@ -136,6 +132,8 @@ describe "UserPagesController", ->
@UserPagesController.sessionsPage @req, @res, @next
describe "settingsPage", ->
+ beforeEach ->
+ @UserGetter.getUser = sinon.stub().callsArgWith(1, null, @user)
it "should render user/settings", (done)->
@res.render = (page)->
@@ -185,6 +183,7 @@ describe "UserPagesController", ->
describe "activateAccountPage", ->
beforeEach ->
+ @UserGetter.getUser = sinon.stub().callsArgWith(2, null, @user)
@req.query.user_id = @user_id
@req.query.token = @token = "mock-token-123"
diff --git a/services/web/test/unit/coffee/User/UserRegistrationHandlerTests.coffee b/services/web/test/unit/coffee/User/UserRegistrationHandlerTests.coffee
index d0b96da2de..9411059022 100644
--- a/services/web/test/unit/coffee/User/UserRegistrationHandlerTests.coffee
+++ b/services/web/test/unit/coffee/User/UserRegistrationHandlerTests.coffee
@@ -12,8 +12,9 @@ describe "UserRegistrationHandler", ->
@user =
_id: @user_id = "31j2lk21kjl"
@User =
- findOne:sinon.stub()
update: sinon.stub().callsArgWith(2)
+ @UserGetter =
+ getUserByMainEmail: sinon.stub()
@UserCreator =
createNewUser:sinon.stub().callsArgWith(1, null, @user)
@AuthenticationManager =
@@ -26,6 +27,7 @@ describe "UserRegistrationHandler", ->
getNewToken: sinon.stub()
@handler = SandboxedModule.require modulePath, requires:
"../../models/User": {User:@User}
+ "./UserGetter": @UserGetter
"./UserCreator": @UserCreator
"../Authentication/AuthenticationManager":@AuthenticationManager
"../Newsletter/NewsletterManager":@NewsLetterManager
@@ -70,7 +72,7 @@ describe "UserRegistrationHandler", ->
beforeEach ->
@user.holdingAccount = true
@handler._registrationRequestIsValid = sinon.stub().returns true
- @User.findOne.callsArgWith(1, null, @user)
+ @UserGetter.getUserByMainEmail.callsArgWith(1, null, @user)
it "should not create a new user if there is a holding account there", (done)->
@handler.registerNewUser @passingRequest, (err)=>
@@ -94,7 +96,7 @@ describe "UserRegistrationHandler", ->
done()
it "should return email registered in the error if there is a non holdingAccount there", (done)->
- @User.findOne.callsArgWith(1, null, @user = {holdingAccount:false})
+ @UserGetter.getUserByMainEmail.callsArgWith(1, null, @user = {holdingAccount:false})
@handler.registerNewUser @passingRequest, (err, user)=>
err.should.deep.equal new Error("EmailAlreadyRegistered")
user.should.deep.equal @user
@@ -103,7 +105,7 @@ describe "UserRegistrationHandler", ->
describe "validRequest", ->
beforeEach ->
@handler._registrationRequestIsValid = sinon.stub().returns true
- @User.findOne.callsArgWith 1
+ @UserGetter.getUserByMainEmail.callsArgWith 1
it "should create a new user", (done)->
@handler.registerNewUser @passingRequest, (err)=>
diff --git a/services/web/test/unit/coffee/User/UserUpdaterTests.coffee b/services/web/test/unit/coffee/User/UserUpdaterTests.coffee
index a6239e2e65..202a4f3f1a 100644
--- a/services/web/test/unit/coffee/User/UserUpdaterTests.coffee
+++ b/services/web/test/unit/coffee/User/UserUpdaterTests.coffee
@@ -14,12 +14,12 @@ describe "UserUpdater", ->
@mongojs =
db:{}
ObjectId:(id)-> return id
- @UserLocator =
- findByEmail:sinon.stub()
+ @UserGetter =
+ getUserByMainEmail: sinon.stub()
@UserUpdater = SandboxedModule.require modulePath, requires:
"settings-sharelatex":@settings
"logger-sharelatex": log:->
- "./UserLocator":@UserLocator
+ "./UserGetter": @UserGetter
"../../infrastructure/mongojs":@mongojs
"metrics-sharelatex": timeAsyncMethod: sinon.stub()
@@ -34,7 +34,7 @@ describe "UserUpdater", ->
@UserUpdater.updateUser = sinon.stub().callsArgWith(2)
it "should check if the new email already has an account", (done)->
- @UserLocator.findByEmail.callsArgWith(1, null, @stubbedUser)
+ @UserGetter.getUserByMainEmail.callsArgWith(1, null, @stubbedUser)
@UserUpdater.changeEmailAddress @user_id, @stubbedUser.email, (err)=>
@UserUpdater.updateUser.called.should.equal false
should.exist(err)
@@ -42,7 +42,7 @@ describe "UserUpdater", ->
it "should set the users password", (done)->
- @UserLocator.findByEmail.callsArgWith(1, null)
+ @UserGetter.getUserByMainEmail.callsArgWith(1, null)
@UserUpdater.changeEmailAddress @user_id, @newEmail, (err)=>
@UserUpdater.updateUser.calledWith(@user_id, $set: { "email": @newEmail}).should.equal true
done()
diff --git a/services/web/test/unit/coffee/infrastructure/LockManager/ReleasingTheLock.coffee b/services/web/test/unit/coffee/infrastructure/LockManager/ReleasingTheLock.coffee
index 256f72f95f..76747defbb 100644
--- a/services/web/test/unit/coffee/infrastructure/LockManager/ReleasingTheLock.coffee
+++ b/services/web/test/unit/coffee/infrastructure/LockManager/ReleasingTheLock.coffee
@@ -3,23 +3,25 @@ assert = require('assert')
path = require('path')
modulePath = path.join __dirname, '../../../../../app/js/infrastructure/LockManager.js'
lockKey = "lock:web:{#{5678}}"
+lockValue = "123456"
SandboxedModule = require('sandboxed-module')
describe 'LockManager - releasing the lock', ()->
- deleteStub = sinon.stub().callsArgWith(1)
+ deleteStub = sinon.stub().callsArgWith(4)
mocks =
"logger-sharelatex": log:->
"./RedisWrapper":
client: ()->
auth:->
- del:deleteStub
-
- LockManager = SandboxedModule.require(modulePath, requires: mocks)
+ eval:deleteStub
+ LockManager = SandboxedModule.require(modulePath, requires: mocks)
+ LockManager.unlockScript = "this is the unlock script"
+
it 'should put a all data into memory', (done)->
- LockManager._releaseLock lockKey, ->
- deleteStub.calledWith(lockKey).should.equal true
+ LockManager._releaseLock lockKey, lockValue, ->
+ deleteStub.calledWith(LockManager.unlockScript, 1, lockKey, lockValue).should.equal true
done()
diff --git a/services/web/test/unit/coffee/infrastructure/LockManager/tryLockTests.coffee b/services/web/test/unit/coffee/infrastructure/LockManager/tryLockTests.coffee
index b3719623bb..9988b8583b 100644
--- a/services/web/test/unit/coffee/infrastructure/LockManager/tryLockTests.coffee
+++ b/services/web/test/unit/coffee/infrastructure/LockManager/tryLockTests.coffee
@@ -22,10 +22,11 @@ describe 'LockManager - trying the lock', ->
describe "when the lock is not set", ->
beforeEach ->
@set.callsArgWith(5, null, "OK")
+ @LockManager.randomLock = sinon.stub().returns("random-lock-value")
@LockManager._tryLock @key, @namespace, @callback
it "should set the lock key with an expiry if it is not set", ->
- @set.calledWith(@key, "locked", "EX", 30, "NX")
+ @set.calledWith(@key, "random-lock-value", "EX", 30, "NX")
.should.equal true
it "should return the callback with true", ->
diff --git a/services/web/test/unit_frontend/coffee/ide/editor/aceEditor/spell-check/SpellCheckManagerTests.coffee b/services/web/test/unit_frontend/coffee/ide/editor/aceEditor/spell-check/SpellCheckManagerTests.coffee
new file mode 100644
index 0000000000..1b0dddced6
--- /dev/null
+++ b/services/web/test/unit_frontend/coffee/ide/editor/aceEditor/spell-check/SpellCheckManagerTests.coffee
@@ -0,0 +1,46 @@
+define [
+ 'ide/editor/directives/aceEditor/spell-check/SpellCheckManager'
+], (SpellCheckManager) ->
+ describe 'SpellCheckManager', ->
+ beforeEach (done) ->
+ @timelord = sinon.useFakeTimers()
+
+ window.user = { id: 1 }
+ window.csrfToken = 'token'
+ @scope = {
+ $watch: sinon.stub()
+ spellCheck: true
+ spellCheckLanguage: 'en'
+ }
+ @highlightedWordManager = {
+ reset: sinon.stub()
+ clearRow: sinon.stub()
+ addHighlight: sinon.stub()
+ }
+ @adapter = {
+ getLines: sinon.stub()
+ highlightedWordManager: @highlightedWordManager
+ }
+ inject ($q, $http, $httpBackend, $cacheFactory) =>
+ @$http = $http
+ @$q = $q
+ @$httpBackend = $httpBackend
+ cache = $cacheFactory('spellCheckTest', {capacity: 1000})
+ @spellCheckManager = new SpellCheckManager(@scope, cache, $http, $q, @adapter)
+ done()
+
+ afterEach ->
+ @timelord.restore()
+
+ it 'runs a full check soon after init', () ->
+ @$httpBackend.when('POST', '/spelling/check').respond({
+ misspellings: [{
+ index: 0
+ suggestions: ['opposition']
+ }]
+ })
+ @adapter.getLines.returns(['oppozition'])
+ @spellCheckManager.init()
+ @timelord.tick(200)
+ @$httpBackend.flush()
+ expect(@highlightedWordManager.addHighlight).to.have.been.called
diff --git a/services/web/webpack.config.js b/services/web/webpack.config.js
index da0dc8257e..34ea397d36 100644
--- a/services/web/webpack.config.js
+++ b/services/web/webpack.config.js
@@ -1,7 +1,9 @@
const fs = require('fs')
const path = require('path')
+const webpack = require('webpack')
const MODULES_PATH = path.join(__dirname, '/modules')
+const webpackENV = process.env.WEBPACK_ENV || 'development'
// Generate a hash of entry points, including modules
const entryPoints = {}
@@ -60,10 +62,35 @@ module.exports = {
cacheDirectory: true
}
}]
+ },
+ {
+ // These options are necesary for handlebars to have access to helper
+ // methods
+ test: /\.handlebars$/,
+ loader: "handlebars-loader",
+ options: {
+ compat: true,
+ knownHelpersOnly: false,
+ runtimePath: 'handlebars/runtime',
+ }
}]
},
-
- // TODO
- // plugins: {}
+ resolve: {
+ alias: {
+ // makes handlerbars globally accessible to backbone
+ handlebars: 'handlebars/dist/handlebars.min.js',
+ jquery: path.join(__dirname, 'node_modules/jquery/dist/jquery'),
+ }
+ },
+ plugins: [
+ new webpack.DefinePlugin({
+ // Swaps out checks for NODE_ENV with the env. This is used by various
+ // libs to enable dev-only features. These checks then become something
+ // like `if ('production' == 'production')`. Minification will then strip
+ // the dev-only code from the bundle
+ 'process.env': {
+ NODE_ENV: JSON.stringify(webpackENV)
+ },
+ })
+ ]
}
-