CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test oauth

Browse Source
This commit is contained in:
Tom MacWright
2012-12-03 12:28:11 -05:00
parent 24422c61e6
commit a4e480a3ab
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/id/connection.js
View File

@@ -5,7 +5,7 @@ iD.Connection = function() {
connection = {},
refNodes = {},
user = {},
oauth = iD.OAuth().setAPI(apiURL);
oauth = iD.OAuth().api(apiURL);
// Request data within the bbox from an external OSM server.
function bboxFromAPI(box, callback) {
@@ -134,7 +134,7 @@ iD.Connection = function() {
connection.url = function(x) {
if (!arguments.length) return apiURL;
apiURL = x;
oauth.setAPI(x);
oauth.api(x);
return connection;
};

5
js/id/oauth.js
View File

@@ -109,8 +109,9 @@ iD.OAuth = function() {
});
};
oauth.setAPI = function(x) {
apibase = x;
oauth.api = function(_) {
if (!arguments.length) return apibase;
apibase = _;
return oauth;
};

1
test/index.html
View File

@@ -53,6 +53,7 @@
<script type="text/javascript" src="spec/way.js"></script>
<script type="text/javascript" src="spec/map.js"></script>
<script type="text/javascript" src="spec/hash.js"></script>
<script type="text/javascript" src="spec/oauth.js"></script>
<script type="text/javascript" src="spec/graph.js"></script>
<script type="text/javascript" src="spec/entity.js"></script>
<script type="text/javascript" src="spec/connection.js"></script>

19
test/spec/oauth.js Normal file
View File

@@ -0,0 +1,19 @@
describe('OAuth', function() {
var o;
beforeEach(function() {
o = iD.OAuth();
});
describe('#logout', function() {
it('can log out and will no longer be authenticated', function() {
expect(o.logout()).toEqual(o);
expect(o.authenticated()).toBeFalsy();
});
});
describe('#api', function() {
it('gets and sets url', function() {
expect(o.api('foo')).toEqual(o);
expect(o.api()).toBe('foo');
});
});
});