Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
4bcb73e4
Commit
4bcb73e4
authored
Feb 05, 2015
by
Aron Carroll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1903 from hypothesis/no-account-module
Eliminate the explicit account module.
parents
90c39fef
11e809f7
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
89 additions
and
97 deletions
+89
-97
account-controller.coffee
h/static/scripts/account/account-controller.coffee
+1
-1
account.coffee
h/static/scripts/account/account.coffee
+2
-8
auth-controller.coffee
h/static/scripts/account/auth-controller.coffee
+1
-1
app.coffee
h/static/scripts/app.coffee
+0
-1
account-controller-test.coffee
tests/js/account/account-controller-test.coffee
+2
-2
auth-controller-test.coffee
tests/js/account/auth-controller-test.coffee
+83
-84
No files found.
h/static/scripts/account/account-controller.coffee
View file @
4bcb73e4
...
...
@@ -87,5 +87,5 @@ class AccountController
angular
.
module
(
'h
.account
'
)
angular
.
module
(
'h'
)
.
controller
(
'AccountController'
,
AccountController
)
h/static/scripts/account/account.coffee
View file @
4bcb73e4
imports
=
[
'ngRoute'
'h.identity'
'h.helpers'
'h.session'
]
AUTH_SESSION_ACTIONS
=
[
'login'
'logout'
...
...
@@ -126,6 +119,7 @@ configure = [
]
angular
.
module
(
'h.account'
,
imports
,
configure
)
angular
.
module
(
'h'
)
.
config
(
configure
)
.
controller
(
'AuthAppController'
,
AuthAppController
)
.
controller
(
'AuthPageController'
,
AuthPageController
)
h/static/scripts/account/auth-controller.coffee
View file @
4bcb73e4
...
...
@@ -53,5 +53,5 @@ class AuthController
,
300000
angular
.
module
(
'h
.account
'
)
angular
.
module
(
'h'
)
.
controller
(
'AuthController'
,
AuthController
)
h/static/scripts/app.coffee
View file @
4bcb73e4
...
...
@@ -3,7 +3,6 @@ imports = [
'ngRoute'
'ngSanitize'
'ngTagsInput'
'h.account'
'h.helpers'
'h.identity'
'h.session'
...
...
tests/js/account/account-controller-test.coffee
View file @
4bcb73e4
...
...
@@ -2,7 +2,7 @@ assert = chai.assert
sinon
.
assert
.
expose
assert
,
prefix
:
null
sandbox
=
sinon
.
sandbox
.
create
()
describe
'
h.account.
AccountController'
,
->
describe
'AccountController'
,
->
$scope
=
null
fakeFlash
=
null
fakeSession
=
null
...
...
@@ -14,7 +14,7 @@ describe 'h.account.AccountController', ->
profilePromise
=
null
createController
=
null
beforeEach
module
(
'h
.account
'
)
beforeEach
module
(
'h'
)
beforeEach
module
(
$provide
,
$filterProvider
)
->
fakeSession
=
{}
...
...
tests/js/account/auth-controller-test.coffee
View file @
4bcb73e4
...
...
@@ -19,8 +19,13 @@ class MockSession
mockFlash
=
sandbox
.
spy
()
mockFormHelpers
=
applyValidationErrors
:
sandbox
.
spy
()
describe
'h.account'
,
->
beforeEach
module
(
'h.account'
)
describe
'AuthController'
,
->
$scope
=
null
$timeout
=
null
auth
=
null
session
=
null
beforeEach
module
(
'h'
)
beforeEach
module
(
'h.templates'
)
beforeEach
module
(
$provide
)
->
...
...
@@ -30,15 +35,6 @@ describe 'h.account', ->
$provide
.
value
'formHelpers'
,
mockFormHelpers
return
afterEach
->
sandbox
.
restore
()
describe
'AuthController'
,
->
$scope
=
null
$timeout
=
null
auth
=
null
session
=
null
beforeEach
inject
(
$controller
,
$rootScope
,
_$timeout_
,
_session_
)
->
$scope
=
$rootScope
.
$new
()
$timeout
=
_$timeout_
...
...
@@ -46,6 +42,9 @@ describe 'h.account', ->
session
=
_session_
sandbox
.
spy
session
,
'login'
afterEach
->
sandbox
.
restore
()
describe
'#submit()'
,
->
it
'should call session methods on submit'
,
->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment