imap-backup 2.1.1 → 3.0.0

data/spec/unit/imap/backup/configuration/account_spec.rb

@@ -1,30 +1,16 @@
-# rubocop:disable RSpec/NestedGroups
-
 describe Imap::Backup::Configuration::Account do
-  class MockHighlineMenu
-    attr_reader :choices
-    attr_accessor :header
+  ACCOUNT = "account".freeze
+  GMAIL_IMAP_SERVER = "imap.gmail.com".freeze
+  HIGHLINE = "highline".freeze
+  STORE = "store".freeze
 
-    def initialize
-      @choices = {}
-    end
+  subject { described_class.new(store, account, highline) }
 
-    def choice(name, &block)
-      choices[name] = block
-    end
-
-    def hidden(name, &block)
-      choices[name] = block
-    end
-  end
+  let(:account) { ACCOUNT }
+  let(:highline) { HIGHLINE }
+  let(:store) { STORE }
 
   describe "#initialize" do
-    subject { described_class.new(store, account, highline) }
-
-    let(:store) { "store" }
-    let(:account) { "account" }
-    let(:highline) { "highline" }
-
     [:store, :account, :highline].each do |param|
       it "expects #{param}" do
         expect(subject.send(param)).to eq(send(param))
@@ -33,10 +19,27 @@ describe Imap::Backup::Configuration::Account do
   end
 
   describe "#run" do
-    subject { described_class.new(store, account, highline) }
+    let(:highline_menu_class) do
+      Class.new do
+        attr_reader :choices
+        attr_accessor :header
+
+        def initialize
+          @choices = {}
+        end
+
+        def choice(name, &block)
+          choices[name] = block
+        end
+
+        def hidden(name, &block)
+          choices[name] = block
+        end
+      end
+    end
 
     let(:highline) { instance_double(HighLine) }
-    let(:menu) { MockHighlineMenu.new }
+    let(:menu) { highline_menu_class.new }
     let(:store) do
       instance_double(Imap::Backup::Configuration::Store, accounts: accounts)
     end
@@ -44,7 +47,7 @@ describe Imap::Backup::Configuration::Account do
     let(:account) do
       {
         username: existing_email,
-        server: existing_server,
+        server: current_server,
         local_path: "/backup/path",
         folders: [{name: "my_folder"}],
         password: existing_password
@@ -58,7 +61,7 @@ describe Imap::Backup::Configuration::Account do
     end
     let(:existing_email) { "user@example.com" }
     let(:new_email) { "foo@example.com" }
-    let(:existing_server) { "imap.example.com" }
+    let(:current_server) { "imap.example.com" }
     let(:existing_password) { "password" }
     let(:other_email) { "other@example.com" }
     let(:other_existing_path) { "/other/existing/path" }
@@ -73,15 +76,17 @@ describe Imap::Backup::Configuration::Account do
     end
 
     describe "preparation" do
-      before { subject.run }
-
       it "clears the screen" do
-        expect(Kernel).to have_received(:system).with("clear")
+        expect(Kernel).to receive(:system).with("clear")
+
+        subject.run
       end
 
       describe "menu" do
         it "shows the menu" do
-          expect(highline).to have_received(:choose)
+          expect(highline).to receive(:choose)
+
+          subject.run
         end
       end
     end
@@ -132,7 +137,7 @@ describe Imap::Backup::Configuration::Account do
       end
     end
 
-    describe "email" do
+    describe "choosing 'modify email'" do
       before do
         allow(Imap::Backup::Configuration::Asker).
           to receive(:email) { new_email }
@@ -142,7 +147,7 @@ describe Imap::Backup::Configuration::Account do
 
       context "when the server is blank" do
         [
-          ["GMail", "foo@gmail.com", "imap.gmail.com"],
+          ["GMail", "foo@gmail.com", GMAIL_IMAP_SERVER],
           ["Fastmail", "bar@fastmail.fm", "imap.fastmail.com"],
           ["Fastmail", "bar@fastmail.com", "imap.fastmail.com"]
         ].each do |service, email, expected|
@@ -150,7 +155,7 @@ describe Imap::Backup::Configuration::Account do
             let(:new_email) { email }
 
             context "with nil" do
-              let(:existing_server) { nil }
+              let(:current_server) { nil }
 
               it "sets a default server" do
                 expect(account[:server]).to eq(expected)
@@ -158,7 +163,7 @@ describe Imap::Backup::Configuration::Account do
             end
 
             context "with an empty string" do
-              let(:existing_server) { "" }
+              let(:current_server) { "" }
 
               it "sets a default server" do
                 expect(account[:server]).to eq(expected)
@@ -168,7 +173,7 @@ describe Imap::Backup::Configuration::Account do
         end
 
         context "when the domain is unrecognized" do
-          let(:existing_server) { nil }
+          let(:current_server) { nil }
           let(:provider) do
             instance_double(Email::Provider, provider: :default)
           end
@@ -207,12 +212,18 @@ describe Imap::Backup::Configuration::Account do
       end
     end
 
-    describe "password" do
+    describe "choosing 'modify password'" do
       let(:new_password) { "new_password" }
+      let(:gmail_oauth2) do
+        instance_double(Imap::Backup::Configuration::GmailOauth2, run: nil)
+      end
 
       before do
         allow(Imap::Backup::Configuration::Asker).
           to receive(:password) { new_password }
+        allow(Imap::Backup::Configuration::GmailOauth2).
+          to receive(:new).
+            with(account) { gmail_oauth2 }
         subject.run
         menu.choices["modify password"].call
       end
@@ -234,14 +245,24 @@ describe Imap::Backup::Configuration::Account do
 
         include_examples "it doesn't flag the account as modified"
       end
+
+      context "when the server is for GMail" do
+        let(:current_server) { GMAIL_IMAP_SERVER }
+
+        it "sets up GMail OAuth2" do
+          expect(gmail_oauth2).to have_received(:run)
+        end
+      end
     end
 
-    describe "server" do
+    describe "choosing 'modify server'" do
       let(:server) { "server" }
 
       before do
-        allow(highline).to receive(:ask).with("server: ").and_return(server)
+        allow(highline).to receive(:ask).with("server: ") { server }
+
         subject.run
+
         menu.choices["modify server"].call
       end
 
@@ -252,7 +273,7 @@ describe Imap::Backup::Configuration::Account do
       include_examples "it flags the account as modified"
     end
 
-    describe "backup_path" do
+    describe "choosing 'modify backup path'" do
       let(:new_backup_path) { "/new/path" }
 
       before do
@@ -290,7 +311,7 @@ describe Imap::Backup::Configuration::Account do
       include_examples "it flags the account as modified"
     end
 
-    describe "folders" do
+    describe "choosing 'choose backup folders'" do
       let(:chooser) do
         instance_double(Imap::Backup::Configuration::FolderChooser, run: nil)
       end
@@ -307,10 +328,10 @@ describe Imap::Backup::Configuration::Account do
       end
     end
 
-    describe "connection test" do
+    describe "choosing 'test connection'" do
       before do
         allow(Imap::Backup::Configuration::ConnectionTester).
-          to receive(:test).and_return("All fine")
+          to receive(:test) { "All fine" }
         allow(highline).to receive(:ask)
         subject.run
         menu.choices["test connection"].call
@@ -322,11 +343,11 @@ describe Imap::Backup::Configuration::Account do
       end
     end
 
-    describe "deletion" do
+    describe "choosing 'delete'" do
       let(:confirmed) { true }
 
       before do
-        allow(highline).to receive(:agree).and_return(confirmed)
+        allow(highline).to receive(:agree) { confirmed }
         subject.run
         catch :done do
           menu.choices["delete"].call
@@ -349,5 +370,3 @@ describe Imap::Backup::Configuration::Account do
     end
   end
 end
-
-# rubocop:enable RSpec/NestedGroups

data/spec/unit/imap/backup/configuration/asker_spec.rb

@@ -30,9 +30,9 @@ module Imap::Backup
     ].each do |method, params, prompt|
       context ".#{method}" do
         it "asks for input" do
-          described_class.send(method, *params)
+          expect(highline).to receive(:ask).with("#{prompt}: ")
 
-          expect(highline).to have_received(:ask).with("#{prompt}: ")
+          described_class.send(method, *params)
         end
 
         it "returns the answer" do
@@ -56,16 +56,15 @@ module Imap::Backup
     describe "#email" do
       let(:email) { "email@example.com" }
       let(:answer) { email }
-      let(:result) { subject.email }
-
-      before { result }
 
       it "asks for an email" do
-        expect(highline).to have_received(:ask).with(/email/)
+        expect(highline).to receive(:ask).with(/email/)
+
+        subject.email
       end
 
       it "returns the address" do
-        expect(result).to eq(email)
+        expect(subject.email).to eq(email)
       end
     end
 
@@ -73,7 +72,6 @@ module Imap::Backup
       let(:password1) { "password" }
       let(:password2) { "password" }
       let(:answers) { [true, false] }
-      let(:result) { subject.password }
 
       before do
         i = 0
@@ -84,27 +82,32 @@ module Imap::Backup
           i += 1
           answer
         end
-        result
       end
 
       it "asks for a password" do
-        expect(highline).to have_received(:ask).with("password: ")
+        expect(highline).to receive(:ask).with("password: ")
+
+        subject.password
       end
 
       it "asks for confirmation" do
-        expect(highline).to have_received(:ask).with("repeat password: ")
+        expect(highline).to receive(:ask).with("repeat password: ")
+
+        subject.password
       end
 
       it "returns the password" do
-        expect(result).to eq(password1)
+        expect(subject.password).to eq(password1)
       end
 
       context "with different answers" do
         let(:password2) { "secret" }
 
         it "asks to continue" do
-          expect(highline).to have_received(:agree).
+          expect(highline).to receive(:agree).
             at_least(:once).with(/Continue\?/)
+
+          subject.password
         end
       end
     end
@@ -112,22 +115,22 @@ module Imap::Backup
     describe "#backup_path" do
       let(:path) { "/path" }
       let(:answer) { path }
-      let(:result) { subject.backup_path("", //) }
 
       before do
         allow(highline).to receive(:ask) do |&b|
           b.call query
           path
         end
-        result
       end
 
       it "asks for a directory" do
-        expect(highline).to have_received(:ask).with(/directory/)
+        expect(highline).to receive(:ask).with(/directory/)
+
+        subject.backup_path("", //)
       end
 
       it "returns the path" do
-        expect(result).to eq(path)
+        expect(subject.backup_path("", //)).to eq(path)
       end
     end
   end

data/spec/unit/imap/backup/configuration/connection_tester_spec.rb

@@ -3,32 +3,28 @@ describe Imap::Backup::Configuration::ConnectionTester do
     let(:connection) do
       instance_double(Imap::Backup::Account::Connection, imap: nil)
     end
-    let(:result) { subject.test("foo") }
 
     before do
       allow(Imap::Backup::Account::Connection).to receive(:new) { connection }
     end
 
     describe "call" do
-      before { result }
-
       it "tries to connect" do
-        expect(connection).to have_received(:imap)
+        expect(connection).to receive(:imap)
+
+        subject.test("foo")
       end
     end
 
     describe "success" do
-      before { result }
-
       it "returns success" do
-        expect(result).to match(/successful/)
+        expect(subject.test("foo")).to match(/successful/)
       end
     end
 
     describe "failure" do
       before do
         allow(connection).to receive(:imap).and_raise(error)
-        result
       end
 
       context "with no connection" do
@@ -39,7 +35,7 @@ describe Imap::Backup::Configuration::ConnectionTester do
         end
 
         it "returns error" do
-          expect(result).to match(/no response/i)
+          expect(subject.test("foo")).to match(/no response/i)
         end
       end
 
@@ -47,7 +43,7 @@ describe Imap::Backup::Configuration::ConnectionTester do
         let(:error) { "Error" }
 
         it "returns error" do
-          expect(result).to match(/unexpected error/i)
+          expect(subject.test("foo")).to match(/unexpected error/i)
         end
       end
     end

data/spec/unit/imap/backup/configuration/folder_chooser_spec.rb

@@ -22,13 +22,15 @@ describe Imap::Backup::Configuration::FolderChooser do
     end
 
     describe "display" do
-      before { subject.run }
-
       it "clears the screen" do
-        expect(Kernel).to have_received(:system).with("clear")
+        expect(Kernel).to receive(:system).with("clear")
+
+        subject.run
       end
 
       it "shows the menu" do
+        subject.run
+
         expect(output.string).to match %r{Add/remove folders}
       end
     end
@@ -114,13 +116,14 @@ describe Imap::Backup::Configuration::FolderChooser do
 
       before do
         allow(Imap::Backup::Configuration::Setup.highline).
-          to receive(:ask).and_return("q")
-        subject.run
+          to receive(:ask) { "q" }
       end
 
       it "asks to press a key" do
         expect(Imap::Backup::Configuration::Setup.highline).
-          to have_received(:ask).with("Press a key ")
+          to receive(:ask).with("Press a key ")
+
+        subject.run
       end
     end
 
@@ -129,18 +132,21 @@ describe Imap::Backup::Configuration::FolderChooser do
         allow(Imap::Backup::Account::Connection).
           to receive(:new).with(account).and_raise("error")
         allow(Imap::Backup::Configuration::Setup.highline).
-          to receive(:ask).and_return("q")
-        subject.run
+          to receive(:ask) { "q" }
       end
 
       it "prints an error message" do
         expect(Imap::Backup.logger).
-          to have_received(:warn).with("Connection failed")
+          to receive(:warn).with("Connection failed")
+
+        subject.run
       end
 
       it "asks to continue" do
         expect(Imap::Backup::Configuration::Setup.highline).
-          to have_received(:ask).with("Press a key ")
+          to receive(:ask).with("Press a key ")
+
+        subject.run
       end
     end
   end