imap-backup 4.0.5 → 4.1.2

data/spec/unit/imap/backup/{configuration → setup}/account_spec.rb

@@ -1,17 +1,43 @@
-describe Imap::Backup::Configuration::Account do
+describe Imap::Backup::Setup::Account do
   ACCOUNT = "account".freeze
   GMAIL_IMAP_SERVER = "imap.gmail.com".freeze
   HIGHLINE = "highline".freeze
-  STORE = "store".freeze
-
-  subject { described_class.new(store, account, highline) }
+  CONFIG = "config".freeze
+
+  subject { described_class.new(config, account, highline) }
+
+  let(:account) do
+    instance_double(
+      Imap::Backup::Account,
+      username: existing_email,
+      password: existing_password,
+      server: current_server,
+      connection_options: nil,
+      local_path: "/backup/path",
+      folders: [{name: "my_folder"}],
+      modified?: false
+    )
+  end
+  let(:account1) do
+    instance_double(
+      Imap::Backup::Account,
+      username: other_email,
+      local_path: other_existing_path
+    )
+  end
+  let(:accounts) { [account, account1] }
+  let(:existing_email) { "user@example.com" }
+  let(:new_email) { "foo@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" }
 
-  let(:account) { ACCOUNT }
   let(:highline) { HIGHLINE }
-  let(:store) { STORE }
+  let(:config) { CONFIG }
 
   describe "#initialize" do
-    [:store, :account, :highline].each do |param|
+    [:config, :account, :highline].each do |param|
       it "expects #{param}" do
         expect(subject.send(param)).to eq(send(param))
       end
@@ -40,31 +66,9 @@ describe Imap::Backup::Configuration::Account do
 
     let(:highline) { instance_double(HighLine) }
     let(:menu) { highline_menu_class.new }
-    let(:store) do
-      instance_double(Imap::Backup::Configuration::Store, accounts: accounts)
-    end
-    let(:accounts) { [account, account1] }
-    let(:account) do
-      {
-        username: existing_email,
-        server: current_server,
-        local_path: "/backup/path",
-        folders: [{name: "my_folder"}],
-        password: existing_password
-      }
+    let(:config) do
+      instance_double(Imap::Backup::Configuration, accounts: accounts)
     end
-    let(:account1) do
-      {
-        username: other_email,
-        local_path: other_existing_path
-      }
-    end
-    let(:existing_email) { "user@example.com" }
-    let(:new_email) { "foo@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" }
 
     before do
       allow(Kernel).to receive(:system)
@@ -100,7 +104,7 @@ describe Imap::Backup::Configuration::Account do
         "choose backup folders",
         "test connection",
         "delete",
-        "return to main menu",
+        "(q) return to main menu",
         "quit" # TODO: quit is hidden
       ].each do |item|
         before { subject.run }
@@ -113,11 +117,11 @@ describe Imap::Backup::Configuration::Account do
 
     describe "account details" do
       [
-        ["email", /email:\s+user@example.com/],
-        ["server", /server:\s+imap.example.com/],
-        ["password", /password:\s+x+/],
-        ["path", %r(path:\s+/backup/path)],
-        ["folders", /folders:\s+my_folder/]
+        ["email", /email\s+user@example.com/],
+        ["password", /password\s+x+/],
+        ["path", %r(path\s+/backup/path)],
+        ["folders", /folders\s+my_folder/],
+        ["server", /server\s+imap.example.com/]
       ].each do |attribute, value|
         before { subject.run }
 
@@ -132,14 +136,16 @@ describe Imap::Backup::Configuration::Account do
         before { subject.run }
 
         it "indicates that a password is not set" do
-          expect(menu.header).to include("password: (unset)")
+          expect(menu.header).to include("password   (unset)")
         end
       end
     end
 
     describe "choosing 'modify email'" do
       before do
-        allow(Imap::Backup::Configuration::Asker).
+        allow(account).to receive(:"username=")
+        allow(account).to receive(:"server=")
+        allow(Imap::Backup::Setup::Asker).
           to receive(:email) { new_email }
         subject.run
         menu.choices["modify email"].call
@@ -158,7 +164,7 @@ describe Imap::Backup::Configuration::Account do
               let(:current_server) { nil }
 
               it "sets a default server" do
-                expect(account[:server]).to eq(expected)
+                expect(account).to have_received(:"server=").with(expected)
               end
             end
 
@@ -166,7 +172,7 @@ describe Imap::Backup::Configuration::Account do
               let(:current_server) { "" }
 
               it "sets a default server" do
-                expect(account[:server]).to eq(expected)
+                expect(account).to have_received(:"server=").with(expected)
               end
             end
           end
@@ -183,17 +189,15 @@ describe Imap::Backup::Configuration::Account do
           end
 
           it "does not set a default server" do
-            expect(account[:server]).to be_nil
+            expect(account).to_not have_received(:"server=")
           end
         end
       end
 
       context "when the email is new" do
         it "modifies the email address" do
-          expect(account[:username]).to eq(new_email)
+          expect(account).to have_received(:"username=").with(new_email)
         end
-
-        include_examples "it flags the account as modified"
       end
 
       context "when the email already exists" do
@@ -205,10 +209,8 @@ describe Imap::Backup::Configuration::Account do
         end
 
         it "doesn't set the email" do
-          expect(account[:username]).to eq(existing_email)
+          expect(account.username).to eq(existing_email)
         end
-
-        include_examples "it doesn't flag the account as modified"
       end
     end
 
@@ -216,7 +218,8 @@ describe Imap::Backup::Configuration::Account do
       let(:new_password) { "new_password" }
 
       before do
-        allow(Imap::Backup::Configuration::Asker).
+        allow(account).to receive(:"password=")
+        allow(Imap::Backup::Setup::Asker).
           to receive(:password) { new_password }
         subject.run
         menu.choices["modify password"].call
@@ -224,20 +227,16 @@ describe Imap::Backup::Configuration::Account do
 
       context "when the user enters a password" do
         it "updates the password" do
-          expect(account[:password]).to eq(new_password)
+          expect(account).to have_received(:"password=").with(new_password)
         end
-
-        include_examples "it flags the account as modified"
       end
 
       context "when the user cancels" do
         let(:new_password) { nil }
 
         it "does nothing" do
-          expect(account[:password]).to eq(existing_password)
+          expect(account.password).to eq(existing_password)
         end
-
-        include_examples "it doesn't flag the account as modified"
       end
     end
 
@@ -245,6 +244,7 @@ describe Imap::Backup::Configuration::Account do
       let(:server) { "server" }
 
       before do
+        allow(account).to receive(:"server=")
         allow(highline).to receive(:ask).with("server: ") { server }
 
         subject.run
@@ -253,19 +253,18 @@ describe Imap::Backup::Configuration::Account do
       end
 
       it "updates the server" do
-        expect(account[:server]).to eq(server)
+        expect(account).to have_received(:"server=").with(server)
       end
-
-      include_examples "it flags the account as modified"
     end
 
     describe "choosing 'modify backup path'" do
       let(:new_backup_path) { "/new/path" }
 
       before do
+        allow(account).to receive(:"local_path=")
         @validator = nil
         allow(
-          Imap::Backup::Configuration::Asker
+          Imap::Backup::Setup::Asker
         ).to receive(:backup_path) do |_path, validator|
           @validator = validator
           new_backup_path
@@ -275,7 +274,7 @@ describe Imap::Backup::Configuration::Account do
       end
 
       it "updates the path" do
-        expect(account[:local_path]).to eq(new_backup_path)
+        expect(account).to have_received(:"local_path=").with(new_backup_path)
       end
 
       context "when the path is not used by other backups" do
@@ -293,17 +292,15 @@ describe Imap::Backup::Configuration::Account do
           # rubocop:enable RSpec/InstanceVariable
         end
       end
-
-      include_examples "it flags the account as modified"
     end
 
     describe "choosing 'choose backup folders'" do
       let(:chooser) do
-        instance_double(Imap::Backup::Configuration::FolderChooser, run: nil)
+        instance_double(Imap::Backup::Setup::FolderChooser, run: nil)
       end
 
       before do
-        allow(Imap::Backup::Configuration::FolderChooser).
+        allow(Imap::Backup::Setup::FolderChooser).
           to receive(:new) { chooser }
         subject.run
         menu.choices["choose backup folders"].call
@@ -315,17 +312,23 @@ describe Imap::Backup::Configuration::Account do
     end
 
     describe "choosing 'test connection'" do
+      let(:connection_tester) do
+        instance_double(
+          Imap::Backup::Setup::ConnectionTester,
+          test: "All fine"
+        )
+      end
+
       before do
-        allow(Imap::Backup::Configuration::ConnectionTester).
-          to receive(:test) { "All fine" }
+        allow(Imap::Backup::Setup::ConnectionTester).
+          to receive(:new) { connection_tester }
         allow(highline).to receive(:ask)
         subject.run
         menu.choices["test connection"].call
       end
 
       it "tests the connection" do
-        expect(Imap::Backup::Configuration::ConnectionTester).
-          to have_received(:test).with(account)
+        expect(connection_tester).to have_received(:test)
       end
     end
 
@@ -333,6 +336,7 @@ describe Imap::Backup::Configuration::Account do
       let(:confirmed) { true }
 
       before do
+        allow(account).to receive(:mark_for_deletion!)
         allow(highline).to receive(:agree) { confirmed }
         subject.run
         catch :done do
@@ -345,13 +349,17 @@ describe Imap::Backup::Configuration::Account do
       end
 
       context "when the user confirms deletion" do
-        include_examples "it flags the account to be deleted"
+        it "flags the account to be deleted" do
+          expect(account).to have_received(:mark_for_deletion!)
+        end
       end
 
       context "without confirmation" do
         let(:confirmed) { false }
 
-        include_examples "it doesn't flag the account to be deleted"
+        it "doesn't flag the account to be deleted" do
+          expect(account).to_not have_received(:mark_for_deletion!)
+        end
       end
     end
   end

data/spec/unit/imap/backup/{configuration → setup}/asker_spec.rb

@@ -1,5 +1,5 @@
 module Imap::Backup
-  describe Configuration::Asker do
+  describe Setup::Asker do
     subject { described_class.new(highline) }
 
     let(:highline) { double }
@@ -16,7 +16,7 @@ module Imap::Backup
     let(:answer) { "foo" }
 
     before do
-      allow(Configuration::Setup).to receive(:highline) { highline }
+      allow(Setup).to receive(:highline) { highline }
       allow(highline).to receive(:ask) do |&b|
         b.call query
         answer

data/spec/unit/imap/backup/{configuration → setup}/connection_tester_spec.rb

@@ -1,5 +1,7 @@
-describe Imap::Backup::Configuration::ConnectionTester do
-  describe ".test" do
+describe Imap::Backup::Setup::ConnectionTester do
+  describe "#test" do
+    subject { described_class.new("foo") }
+
     let(:connection) do
       instance_double(Imap::Backup::Account::Connection, client: nil)
     end
@@ -8,17 +10,15 @@ describe Imap::Backup::Configuration::ConnectionTester do
       allow(Imap::Backup::Account::Connection).to receive(:new) { connection }
     end
 
-    describe "call" do
-      it "tries to connect" do
-        expect(connection).to receive(:client)
+    it "tries to connect" do
+      expect(connection).to receive(:client)
 
-        subject.test("foo")
-      end
+      subject.test
     end
 
     describe "success" do
       it "returns success" do
-        expect(subject.test("foo")).to match(/successful/)
+        expect(subject.test).to match(/successful/)
       end
     end
 
@@ -35,7 +35,7 @@ describe Imap::Backup::Configuration::ConnectionTester do
         end
 
         it "returns error" do
-          expect(subject.test("foo")).to match(/no response/i)
+          expect(subject.test).to match(/no response/i)
         end
       end
 
@@ -43,7 +43,7 @@ describe Imap::Backup::Configuration::ConnectionTester do
         let(:error) { "Error" }
 
         it "returns error" do
-          expect(subject.test("foo")).to match(/unexpected error/i)
+          expect(subject.test).to match(/unexpected error/i)
         end
       end
     end

data/spec/unit/imap/backup/{configuration → setup}/folder_chooser_spec.rb

@@ -1,4 +1,4 @@
-describe Imap::Backup::Configuration::FolderChooser do
+describe Imap::Backup::Setup::FolderChooser do
   include HighLineTestHelpers
 
   describe "#run" do
@@ -6,10 +6,17 @@ describe Imap::Backup::Configuration::FolderChooser do
 
     let(:connection) do
       instance_double(
-        Imap::Backup::Account::Connection, folders: connection_folders
+        Imap::Backup::Account::Connection, folder_names: connection_folders
       )
     end
-    let(:account) { {folders: []} }
+    let(:account) do
+      instance_double(
+        Imap::Backup::Account,
+        folders: account_folders,
+        "folders=": nil
+      )
+    end
+    let(:account_folders) { [] }
     let(:connection_folders) { [] }
     let!(:highline_streams) { prepare_highline }
     let(:input) { highline_streams[0] }
@@ -18,7 +25,7 @@ describe Imap::Backup::Configuration::FolderChooser do
     before do
       allow(Imap::Backup::Account::Connection).to receive(:new) { connection }
       allow(Kernel).to receive(:system)
-      allow(Imap::Backup.logger).to receive(:warn)
+      allow(Imap::Backup::Logger.logger).to receive(:warn)
     end
 
     describe "display" do
@@ -36,7 +43,7 @@ describe Imap::Backup::Configuration::FolderChooser do
     end
 
     describe "folder listing" do
-      let(:account) { {folders: [{name: "my_folder"}]} }
+      let(:account_folders) { [{name: "my_folder"}]}
       let(:connection_folders) do
         # N.B. my_folder is already backed up
         %w(my_folder another_folder)
@@ -62,10 +69,9 @@ describe Imap::Backup::Configuration::FolderChooser do
         end
 
         specify "are added to the account" do
-          expect(account[:folders]).to include(name: "another_folder")
+          expect(account).to have_received(:"folders=").
+            with([{name: "my_folder"}, {name: "another_folder"}])
         end
-
-        include_examples "it flags the account as modified"
       end
 
       context "when removing folders" do
@@ -76,22 +82,16 @@ describe Imap::Backup::Configuration::FolderChooser do
         end
 
         specify "are removed from the account" do
-          expect(account[:folders]).to_not include(name: "my_folder")
+          expect(account).to have_received(:"folders=").with([])
         end
-
-        include_examples "it flags the account as modified"
       end
     end
 
     context "with missing remote folders" do
-      let(:account) do
-        {folders: [{name: "on_server"}, {name: "not_on_server"}]}
-      end
-      let(:connection_folders) do
-        [
-          instance_double(Imap::Backup::Account::Folder, name: "on_server")
-        ]
+      let(:account_folders) do
+        [{name: "on_server"}, {name: "not_on_server"}]
       end
+      let(:connection_folders) { ["on_server"] }
 
       before do
         allow(Kernel).to receive(:puts)
@@ -99,22 +99,21 @@ describe Imap::Backup::Configuration::FolderChooser do
       end
 
       specify "are removed from the account" do
-        expect(account[:folders]).to_not include(name: "not_on_server")
+        expect(account).to have_received(:"folders=").
+          with([{name: "on_server"}])
       end
-
-      include_examples "it flags the account as modified"
     end
 
     context "when folders are not available" do
       let(:connection_folders) { nil }
 
       before do
-        allow(Imap::Backup::Configuration::Setup.highline).
+        allow(Imap::Backup::Setup.highline).
           to receive(:ask) { "q" }
       end
 
       it "asks to press a key" do
-        expect(Imap::Backup::Configuration::Setup.highline).
+        expect(Imap::Backup::Setup.highline).
           to receive(:ask).with("Press a key ")
 
         subject.run
@@ -125,19 +124,19 @@ describe Imap::Backup::Configuration::FolderChooser do
       before do
         allow(Imap::Backup::Account::Connection).
           to receive(:new).with(account).and_raise("error")
-        allow(Imap::Backup::Configuration::Setup.highline).
+        allow(Imap::Backup::Setup.highline).
           to receive(:ask) { "q" }
       end
 
       it "prints an error message" do
-        expect(Imap::Backup.logger).
+        expect(Imap::Backup::Logger.logger).
           to receive(:warn).with("Connection failed")
 
         subject.run
       end
 
       it "asks to continue" do
-        expect(Imap::Backup::Configuration::Setup.highline).
+        expect(Imap::Backup::Setup.highline).
           to receive(:ask).with("Press a key ")
 
         subject.run