octoauth 1.3.0 → 1.4.0

data/spec/fixtures/cassettes/requesting_scopes.yml

@@ -1,43 +1,173 @@
 ---
 http_interactions:
+- request:
+    method: get
+    uri: https://<USER>:<PASSWORD>@api.github.com/authorizations
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.1.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Mon, 26 Oct 2015 02:45:37 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Status:
+      - 200 OK
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4984'
+      X-Ratelimit-Reset:
+      - '1445829724'
+      Cache-Control:
+      - private, max-age=60, s-maxage=60
+      Vary:
+      - Accept, Authorization, Cookie, X-GitHub-OTP
+      - Accept-Encoding
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: ASCII-8BIT
+      string: '[{"id":23673434,"url":"https://api.github.com/authorizations/23673434","app":{"name":"requesting_scopes/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"7873c3c9471702e93416139dec20bc4c6c35e93e91776bbe284e3c08e49020f0","token_last_eight":"07112afc","note":"requesting_scopes/bean","note_url":null,"created_at":"2015-10-26T02:22:04Z","updated_at":"2015-10-26T02:22:04Z","scopes":["gist","delete_repo"],"fingerprint":null},{"id":23673435,"url":"https://api.github.com/authorizations/23673435","app":{"name":"autosave_test/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"d04e11d46f3358c2ccc9ff61a10af5e4bc9de0c468404f6821e6ca3342c6477f","token_last_eight":"4c625306","note":"autosave_test/bean","note_url":null,"created_at":"2015-10-26T02:22:04Z","updated_at":"2015-10-26T02:22:04Z","scopes":[],"fingerprint":null},{"id":23673463,"url":"https://api.github.com/authorizations/23673463","app":{"name":"existing_token/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"81058c676b8a2de95487b5ad9ed1090f74efa8a581ba69487f274c4552b4716a","token_last_eight":"f9a2fcda","note":"existing_token/bean","note_url":null,"created_at":"2015-10-26T02:23:05Z","updated_at":"2015-10-26T02:23:05Z","scopes":[],"fingerprint":null},{"id":23673464,"url":"https://api.github.com/authorizations/23673464","app":{"name":"create_token/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"5296cd63dbc0add3fb40fd96e5c6bf2346464e15a6400183930c6765d8894899","token_last_eight":"f1c8d660","note":"create_token/bean","note_url":null,"created_at":"2015-10-26T02:23:06Z","updated_at":"2015-10-26T02:23:06Z","scopes":[],"fingerprint":null},{"id":23673465,"url":"https://api.github.com/authorizations/23673465","app":{"name":"two_factor_token/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"cf1ef3274bbd1cb0f25cf3c0ae62bba97fb19d6d1278da37c87b60bbbbfd58e9","token_last_eight":"6f534ee7","note":"two_factor_token/bean","note_url":null,"created_at":"2015-10-26T02:23:06Z","updated_at":"2015-10-26T02:23:06Z","scopes":[],"fingerprint":null},{"id":23673471,"url":"https://api.github.com/authorizations/23673471","app":{"name":"write_first_test/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"e1ffd7c1465879b3c776c7be6fe7777f64f2dddb6d09da06f264e563e7c49fa7","token_last_eight":"49a5dcbd","note":"write_first_test/bean","note_url":null,"created_at":"2015-10-26T02:23:24Z","updated_at":"2015-10-26T02:23:24Z","scopes":[],"fingerprint":null}]'
+    http_version: 
+  recorded_at: Mon, 26 Oct 2015 02:45:38 GMT
+- request:
+    method: delete
+    uri: https://<USER>:<PASSWORD>@api.github.com/authorizations/23673434
+    body:
+      encoding: UTF-8
+      string: "{}"
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.1.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 204
+      message: No Content
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Mon, 26 Oct 2015 02:45:38 GMT
+      Status:
+      - 204 No Content
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4983'
+      X-Ratelimit-Reset:
+      - '1445829724'
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Mon, 26 Oct 2015 02:45:38 GMT
 - request:
     method: post
-    uri: https://user:pw@api.github.com/authorizations
+    uri: https://<USER>:<PASSWORD>@api.github.com/authorizations
     body:
       encoding: UTF-8
-      string: '{"note":"foo","scopes":["gist","delete_repo"],"fingerprint":"foo/bean"}'
+      string: '{"note":"requesting_scopes/bean","scopes":["gist","delete_repo"]}'
     headers:
       Accept:
       - application/vnd.github.v3+json
       User-Agent:
-      - Octokit Ruby Gem 4.0.1
+      - Octokit Ruby Gem 4.1.1
       Content-Type:
       - application/json
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
   response:
     status:
-      code: 401
-      message: Unauthorized
+      code: 201
+      message: Created
     headers:
       Server:
       - GitHub.com
       Date:
-      - Sat, 25 Jul 2015 01:56:58 GMT
+      - Mon, 26 Oct 2015 02:45:38 GMT
       Content-Type:
       - application/json; charset=utf-8
       Content-Length:
-      - '83'
+      - '541'
       Status:
-      - 401 Unauthorized
-      X-Github-Media-Type:
-      - github.v3; format=json
+      - 201 Created
       X-Ratelimit-Limit:
-      - '60'
+      - '5000'
       X-Ratelimit-Remaining:
-      - '59'
+      - '4982'
       X-Ratelimit-Reset:
-      - '1437793018'
+      - '1445829724'
+      Cache-Control:
+      - private, max-age=60, s-maxage=60
+      Location:
+      - https://api.github.com/authorizations/23673992
+      Vary:
+      - Accept, Authorization, Cookie, X-GitHub-OTP
+      - Accept-Encoding
+      X-Github-Media-Type:
+      - github.v3; format=json
       X-Xss-Protection:
       - 1; mode=block
       X-Frame-Options:
@@ -57,7 +187,7 @@ http_interactions:
       - nosniff
     body:
       encoding: UTF-8
-      string: '{"message":"Bad credentials","documentation_url":"https://developer.github.com/v3"}'
+      string: '{"id":23673992,"url":"https://api.github.com/authorizations/23673992","app":{"name":"requesting_scopes/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"token_with_scopes","hashed_token":"e41f77be9fe2994e5505437dce25574472b2d64f512305ccb25af6ec36cc9fc5","token_last_eight":"fc1217c4","note":"requesting_scopes/bean","note_url":null,"created_at":"2015-10-26T02:45:38Z","updated_at":"2015-10-26T02:45:38Z","scopes":["gist","delete_repo"],"fingerprint":null}'
     http_version: 
-  recorded_at: Sat, 25 Jul 2015 01:56:58 GMT
+  recorded_at: Mon, 26 Oct 2015 02:45:38 GMT
 recorded_with: VCR 2.9.3

data/spec/fixtures/cassettes/write_to_first_file.yml

@@ -0,0 +1,193 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://<USER>:<PASSWORD>@api.github.com/authorizations
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.1.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Mon, 26 Oct 2015 02:45:40 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Status:
+      - 200 OK
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4966'
+      X-Ratelimit-Reset:
+      - '1445829724'
+      Cache-Control:
+      - private, max-age=60, s-maxage=60
+      Vary:
+      - Accept, Authorization, Cookie, X-GitHub-OTP
+      - Accept-Encoding
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: ASCII-8BIT
+      string: '[{"id":23673471,"url":"https://api.github.com/authorizations/23673471","app":{"name":"write_first_test/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"e1ffd7c1465879b3c776c7be6fe7777f64f2dddb6d09da06f264e563e7c49fa7","token_last_eight":"49a5dcbd","note":"write_first_test/bean","note_url":null,"created_at":"2015-10-26T02:23:24Z","updated_at":"2015-10-26T02:23:24Z","scopes":[],"fingerprint":null},{"id":23673992,"url":"https://api.github.com/authorizations/23673992","app":{"name":"requesting_scopes/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"e41f77be9fe2994e5505437dce25574472b2d64f512305ccb25af6ec36cc9fc5","token_last_eight":"fc1217c4","note":"requesting_scopes/bean","note_url":null,"created_at":"2015-10-26T02:45:38Z","updated_at":"2015-10-26T02:45:38Z","scopes":["gist","delete_repo"],"fingerprint":null},{"id":23673993,"url":"https://api.github.com/authorizations/23673993","app":{"name":"autosave_test/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"db9bfd126cdb10eca25a06df972099ef8f1ff85014a982755efc2f0ef07bc975","token_last_eight":"da02795d","note":"autosave_test/bean","note_url":null,"created_at":"2015-10-26T02:45:38Z","updated_at":"2015-10-26T02:45:38Z","scopes":[],"fingerprint":null},{"id":23673996,"url":"https://api.github.com/authorizations/23673996","app":{"name":"existing_token/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"55a64a37a4d738582ec4d054ce00591588a04ee8ec55a4dda4d53aaf8057a98f","token_last_eight":"c1e9e2ec","note":"existing_token/bean","note_url":null,"created_at":"2015-10-26T02:45:39Z","updated_at":"2015-10-26T02:45:39Z","scopes":[],"fingerprint":null},{"id":23673997,"url":"https://api.github.com/authorizations/23673997","app":{"name":"create_token/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"9be225308ddbc5da3152e399ca3937f5bd19c784dc85f9975015eb5e775c7a00","token_last_eight":"dde1fdd1","note":"create_token/bean","note_url":null,"created_at":"2015-10-26T02:45:40Z","updated_at":"2015-10-26T02:45:40Z","scopes":[],"fingerprint":null},{"id":23673998,"url":"https://api.github.com/authorizations/23673998","app":{"name":"two_factor_token/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"","hashed_token":"343a80905d4861145447d5d965051ae2e4d181d01240e070bf26b8e79eb5e85b","token_last_eight":"982feb05","note":"two_factor_token/bean","note_url":null,"created_at":"2015-10-26T02:45:40Z","updated_at":"2015-10-26T02:45:40Z","scopes":[],"fingerprint":null}]'
+    http_version: 
+  recorded_at: Mon, 26 Oct 2015 02:45:40 GMT
+- request:
+    method: delete
+    uri: https://<USER>:<PASSWORD>@api.github.com/authorizations/23673471
+    body:
+      encoding: UTF-8
+      string: "{}"
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.1.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 204
+      message: No Content
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Mon, 26 Oct 2015 02:45:40 GMT
+      Status:
+      - 204 No Content
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4965'
+      X-Ratelimit-Reset:
+      - '1445829724'
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Mon, 26 Oct 2015 02:45:41 GMT
+- request:
+    method: post
+    uri: https://<USER>:<PASSWORD>@api.github.com/authorizations
+    body:
+      encoding: UTF-8
+      string: '{"note":"write_first_test/bean","scopes":[]}'
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.1.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Mon, 26 Oct 2015 02:45:41 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '519'
+      Status:
+      - 201 Created
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4964'
+      X-Ratelimit-Reset:
+      - '1445829724'
+      Cache-Control:
+      - private, max-age=60, s-maxage=60
+      Location:
+      - https://api.github.com/authorizations/23674000
+      Vary:
+      - Accept, Authorization, Cookie, X-GitHub-OTP
+      - Accept-Encoding
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"id":23674000,"url":"https://api.github.com/authorizations/23674000","app":{"name":"write_first_test/bean","url":"https://developer.github.com/v3/oauth_authorizations/","client_id":"00000000000000000000"},"token":"write_first_test_token","hashed_token":"e636e08ef6d6a5fed226e42d69a9a7885324337d313eea93727ab79c19b3d81b","token_last_eight":"1f6e7bdf","note":"write_first_test/bean","note_url":null,"created_at":"2015-10-26T02:45:41Z","updated_at":"2015-10-26T02:45:41Z","scopes":[],"fingerprint":null}'
+    http_version: 
+  recorded_at: Mon, 26 Oct 2015 02:45:41 GMT
+recorded_with: VCR 2.9.3

data/spec/octoauth/auth_spec.rb

@@ -1,22 +1,16 @@
 require 'spec_helper'
 require 'fileutils'
 
+##
+# Grab creds for setting up VCR
+LOGIN = ENV['OCTOAUTH_LOGIN'] || 'user'
+PASSWORD = ENV['OCTOAUTH_PASSWORD'] || 'pw'
+TWOFACTOR = ENV['OCTOAUTH_TFA'] || '123456'
+
 ##
 # Shim object for mocking auth resources
 AuthShim = Struct.new(:note, :token)
 
-module UserInput
-  ##
-  # Mask prints from UserInput
-  class Prompt
-    def print(*)
-    end
-
-    def puts(*)
-    end
-  end
-end
-
 describe Octoauth do
   describe Octoauth::Auth do
     describe '#initialize' do
@@ -24,82 +18,87 @@ describe Octoauth do
         it 'loads the existing token' do
           VCR.use_cassette('load_existing_token') do
             auth = Octoauth::Auth.new(
-              note: 'foo',
-              file: 'spec/examples/conf_a.yml'
+              note: 'existing_token',
+              file: 'spec/examples/existing_token.yml'
             )
-            expect(auth.token).to eql 'bcdebcdebcdebcdebcdebcdebcde'
+            expect(auth.token).to eql 'an_existing_token'
           end
         end
       end
       context 'if there is a note conflict' do
-        it 'creates_a_new_token' do
-          VCR.use_cassette('creates_new_token') do
-            auth = Octoauth::Auth.new(
-              note: 'existing',
-              login: 'user',
-              password: 'pw'
-            )
-            expect(auth.token).to eql 'existing_token'
+        it 'recreates the token' do
+          VCR.use_cassette('recreate_token') do
+            tokens = (1..2).map do
+              Octoauth::Auth.new(
+                note: 'existing_token',
+                login: LOGIN,
+                password: PASSWORD
+              ).token
+            end
+            expect(tokens.first).not_to eql tokens.last
           end
         end
       end
       context 'if the file does not exist' do
-        it 'requests user input to create token' do
-          VCR.use_cassette('request_user_input') do
+        it 'use user input to create token' do
+          VCR.use_cassette('create_token') do
             auth = Octoauth::Auth.new(
-              note: 'foo',
-              login: 'user',
-              password: 'pw'
+              note: 'create_token',
+              login: LOGIN,
+              password: PASSWORD
             )
-            expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+            expect(auth.token).to eql 'created_token'
           end
         end
         it 'handles users with 2 factor auth enabled' do
           VCR.use_cassette('handle_two_factor') do
-            allow(STDIN).to receive(:gets).and_return("user\n", "pw\n", "1234\n")
-            auth = Octoauth::Auth.new(note: 'foo')
-            expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+            auth = Octoauth::Auth.new(
+              note: 'two_factor_token',
+              login: LOGIN,
+              password: PASSWORD,
+              twofactor: TWOFACTOR
+            )
+            expect(auth.token).to eql '2fa_required_token'
           end
         end
       end
       it 'supports alternate endpoints' do
         VCR.use_cassette('alternate_endpoints') do
           auth = Octoauth::Auth.new(
-            note: 'foo',
-            login: 'user',
-            password: 'pw',
-            api_endpoint: 'https://sekrit.com/api/v3/'
+            note: 'alternate_endpoint',
+            login: LOGIN,
+            password: PASSWORD,
+            api_endpoint: 'https://example.org/api/v3/'
           )
-          expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+          expect(auth.token).to eql 'created_token'
         end
       end
       it 'supports requesting scopes' do
         VCR.use_cassette('requesting_scopes') do
           auth = Octoauth::Auth.new(
-            note: 'foo',
-            login: 'user',
-            password: 'pw',
+            note: 'requesting_scopes',
+            login: LOGIN,
+            password: PASSWORD,
             scopes: %w(gist delete_repo)
           )
-          expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+          expect(auth.token).to eql 'token_with_scopes'
         end
       end
       it 'supports autosaving the config file' do
         VCR.use_cassette('autosaving_config_file') do
-          random = rand(36**30).to_s(30)
           FileUtils.rm_f 'spec/examples/autosave.yml'
           Octoauth::Auth.new(
             note: 'autosave_test',
             file: 'spec/examples/autosave.yml',
-            login: 'user',
-            password: 'pw',
+            login: LOGIN,
+            password: PASSWORD,
             autosave: true
           )
           new_auth = Octoauth::Auth.new(
             note: 'autosave_test',
             file: 'spec/examples/autosave.yml'
           )
-          expect(new_auth.token).to eql random
+          expect(new_auth.token).to eql 'autosaved_token'
         end
       end
     end
@@ -107,73 +106,49 @@ describe Octoauth do
       context 'when the first file exists' do
         it 'reads the first file' do
           auth = Octoauth::Auth.new(
-            note: 'foo',
-            files: ['spec/examples/conf_a.yml', 'spec/examples/bogus.yml']
+            note: 'existing_token',
+            files: ['spec/examples/existing_token.yml', 'bogus.yml']
           )
-          expect(auth.token).to eql 'bcdebcdebcdebcdebcdebcdebcde'
+          expect(auth.token).to eql 'an_existing_token'
         end
       end
       context 'when the first file does not exist' do
         context 'when the second file exists' do
           it 'reads the second file' do
-            FileUtils.rm_f 'spec/examples/nil.yml'
             auth = Octoauth::Auth.new(
-              note: 'foo',
-              files: ['spec/examples/bogus.yml', 'spec/examples/conf_a.yml']
+              note: 'existing_token',
+              files: ['bogus.yml', 'spec/examples/existing_token.yml']
             )
-            expect(auth.token).to eql 'bcdebcdebcdebcdebcdebcdebcde'
+            expect(auth.token).to eql 'an_existing_token'
           end
         end
         context 'when the second file does not exist' do
-          it 'reads nil' do
-            FileUtils.rm_f ['spec/examples/nil.yml', 'spec/examples/nil2.yml']
+          it 'reads nil from the first file' do
             auth = Octoauth::Auth.new(
-              note: 'foo',
-              files: ['spec/examples/nil.yml', 'spec/examples/nil2.yml']
+              note: 'nonexistent_token',
+              files: ['nil.yml', 'nil2.yml']
             )
             expect(auth.send(:config).token).to be_nil
           end
           it 'writes to the first file' do
-            VCR.use_cassette('Write_to_first_file') do
-              random = rand(36**30).to_s(30)
-              FileUtils.rm_f ['spec/examples/nil.yml', 'spec/examples/nil2.yml']
+            VCR.use_cassette('write_to_first_file') do
+              FileUtils.rm_f 'spec/examples/write_first_test.yml'
               auth = Octoauth::Auth.new(
-                note: 'foo',
-                files: ['spec/examples/nil.yml', 'spec/examples/nil2.yml'],
-                login: 'user',
-                password: 'pw'
+                note: 'write_first_test',
+                files: ['spec/examples/write_first_test.yml', 'bogus.yml'],
+                login: LOGIN,
+                password: PASSWORD
               )
               auth.save
               new_auth = Octoauth::Auth.new(
-                note: 'foo',
-                file: 'spec/examples/nil.yml'
+                note: 'write_first_test',
+                file: 'spec/examples/write_first_test.yml'
               )
-              expect(new_auth.token).to eql random
+              expect(new_auth.token).to eql 'write_first_test_token'
             end
           end
         end
       end
     end
-
-    describe '#save' do
-      it 'saves the config to disk' do
-        VCR.use_cassette('save_to_disk') do
-          random = rand(36**30).to_s(30)
-          FileUtils.rm_f 'spec/examples/tmp.yml'
-          auth = Octoauth::Auth.new(
-            note: 'write_test',
-            file: 'spec/examples/tmp.yml',
-            login: 'user',
-            password: 'pw'
-          )
-          auth.save
-          new_auth = Octoauth::Auth.new(
-            note: 'write_test',
-            file: 'spec/examples/tmp.yml'
-          )
-          expect(new_auth.token).to eql random
-        end
-      end
-    end
   end
 end