Merge branch 'master' of github.com:travis-ci/travis-api

Gemfile.lock

@@ -40,7 +40,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 59df1c4523de303f88ca920e5e831fd91cbef8f2
+  revision: 1b8e433f7a1eb8cc3aaa24b3cc2e14a0176218f6
   branch: sf-travis-api
   specs:
     travis-core (0.0.1)

spec/integration/v2/users_spec.rb

@@ -5,12 +5,21 @@ describe 'Users' do
   let(:token)   { Travis::Api::App::AccessToken.create(user: user, app_id: -1) }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json', 'HTTP_AUTHORIZATION' => "token #{token}" } }
 
-  it 'GET /workers' do
+  context 'PUT /users/:id' do
-    params = {user: {id: user.id, locale: 'pl'}}
+    it 'updates user data and returns the user' do
-    response = put "/users/#{user.id}", params, headers
+      params = {user: {id: user.id, locale: 'pl'}}
-    response.should be_successful
+      response = put "/users/#{user.id}", params, headers
-    response.should deliver_json_for(user.reload, version: 'v2')
+      response.should be_successful
-    user.locale.should == 'pl'
+      response.should deliver_json_for(user.reload, version: 'v2')
+      user.locale.should == 'pl'
+    end
+  end
+
+  context 'POST /users/sync' do
+    it 'syncs current_user repos' do
+      response = post "/users/sync", {}, headers
+      response.should be_successful
+    end
   end
 end