imap-backup 2.0.0 → 2.1.0

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

@@ -1,15 +1,16 @@
-require "spec_helper"
-
 describe Imap::Backup::Configuration::ConnectionTester do
   context ".test" do
-    let(:connection) { double("Imap::Backup::Account::Connection", imap: nil) }
+    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
 
     context "call" do
-      before { @result = subject.test("foo") }
+      before { result }
 
       it "tries to connect" do
         expect(connection).to have_received(:imap)
@@ -17,34 +18,36 @@ describe Imap::Backup::Configuration::ConnectionTester do
     end
 
     context "success" do
-      before { @result = subject.test("foo") }
+      before { result }
 
       it "returns success" do
-        expect(@result).to match(/successful/)
+        expect(result).to match(/successful/)
       end
     end
 
     context "failure" do
       before do
         allow(connection).to receive(:imap).and_raise(error)
-        @result = subject.test("foo")
+        result
       end
 
       context "no connection" do
         let(:error) do
-          data = double("foo", text: "bar")
-          Net::IMAP::NoResponseError.new(double("o", data: data))
+          data = OpenStruct.new(text: "bar")
+          response = OpenStruct.new(data: data)
+          Net::IMAP::NoResponseError.new(response)
         end
 
-        it "returns success" do
-          expect(@result).to match(/no response/i)
+        it "returns error" do
+          expect(result).to match(/no response/i)
         end
       end
 
       context "other" do
         let(:error) { "Error" }
-        it "returns success" do
-          expect(@result).to match(/unexpected error/i)
+
+        it "returns error" do
+          expect(result).to match(/unexpected error/i)
         end
       end
     end

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

@@ -1,22 +1,23 @@
-require "spec_helper"
-
 describe Imap::Backup::Configuration::FolderChooser do
   include HighLineTestHelpers
 
   context "#run" do
+    subject { described_class.new(account) }
+
     let(:connection) do
-      double("Imap::Backup::Account::Connection", folders: remote_folders)
+      instance_double(
+        Imap::Backup::Account::Connection, folders: remote_folders
+      )
     end
     let(:account) { {folders: []} }
     let(:remote_folders) { [] }
-
-    subject { described_class.new(account) }
+    let!(:highline_streams) { prepare_highline }
+    let(:input) { highline_streams[0] }
+    let(:output) { highline_streams[1] }
 
     before do
-      allow(Imap::Backup::Account::Connection).
-        to receive(:new).with(account) { connection }
-      @input, @output = prepare_highline
-      allow(subject).to receive(:system)
+      allow(Imap::Backup::Account::Connection).to receive(:new) { connection }
+      allow(Kernel).to receive(:system)
       allow(Imap::Backup.logger).to receive(:warn)
     end
 
@@ -24,11 +25,11 @@ describe Imap::Backup::Configuration::FolderChooser do
       before { subject.run }
 
       it "clears the screen" do
-        expect(subject).to have_received(:system).with("clear")
+        expect(Kernel).to have_received(:system).with("clear")
       end
 
-      it "should show the menu" do
-        expect(@output.string).to match %r{Add/remove folders}
+      it "shows the menu" do
+        expect(output.string).to match %r{Add/remove folders}
       end
     end
 
@@ -36,8 +37,12 @@ describe Imap::Backup::Configuration::FolderChooser do
       let(:account) { {folders: [{name: "my_folder"}]} }
       let(:remote_folders) do
         # this one is already backed up:
-        folder1 = double("folder", name: "my_folder")
-        folder2 = double("folder", name: "another_folder")
+        folder1 = instance_double(
+          Imap::Backup::Account::Folder, name: "my_folder"
+        )
+        folder2 = instance_double(
+          Imap::Backup::Account::Folder, name: "another_folder"
+        )
         [folder1, folder2]
       end
 
@@ -45,17 +50,17 @@ describe Imap::Backup::Configuration::FolderChooser do
         before { subject.run }
 
         it "shows folders which are being backed up" do
-          expect(@output.string).to include("+ my_folder")
+          expect(output.string).to include("+ my_folder")
         end
 
         it "shows folders which are not being backed up" do
-          expect(@output.string).to include("- another_folder")
+          expect(output.string).to include("- another_folder")
         end
       end
 
       context "adding folders" do
         before do
-          allow(@input).to receive(:gets).and_return("2\n", "q\n")
+          allow(input).to receive(:gets).and_return("2\n", "q\n")
 
           subject.run
         end
@@ -69,7 +74,7 @@ describe Imap::Backup::Configuration::FolderChooser do
 
       context "removing folders" do
         before do
-          allow(@input).to receive(:gets).and_return("1\n", "q\n")
+          allow(input).to receive(:gets).and_return("1\n", "q\n")
 
           subject.run
         end
@@ -82,6 +87,28 @@ describe Imap::Backup::Configuration::FolderChooser do
       end
     end
 
+    context "with missing remote folders" do
+      let(:account) do
+        {folders: [{name: "on_server"}, {name: "not_on_server"}]}
+      end
+      let(:remote_folders) do
+        [
+          instance_double(Imap::Backup::Account::Folder, name: "on_server")
+        ]
+      end
+
+      before do
+        allow(Kernel).to receive(:puts)
+        subject.run
+      end
+
+      specify "are removed from the account" do
+        expect(account[:folders]).to_not include(name: "not_on_server")
+      end
+
+      include_examples "it flags the account as modified"
+    end
+
     context "when folders are not available" do
       let(:remote_folders) { nil }
 

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

@@ -1,6 +1,6 @@
-require "spec_helper"
-
 describe Imap::Backup::Configuration::List do
+  subject { described_class.new }
+
   let(:accounts) do
     [
       {username: "a1@example.com"},
@@ -8,14 +8,14 @@ describe Imap::Backup::Configuration::List do
     ]
   end
   let(:store) do
-    double("Imap::Backup::Configuration::Store", accounts: accounts)
+    instance_double(Imap::Backup::Configuration::Store, accounts: accounts)
   end
   let(:exists) { true }
   let(:connection1) do
-    double("Imap::Backup::Account::Connection", disconnect: nil)
+    instance_double(Imap::Backup::Account::Connection, disconnect: nil)
   end
   let(:connection2) do
-    double("Imap::Backup::Account::Connection", disconnect: nil)
+    instance_double(Imap::Backup::Account::Connection, disconnect: nil)
   end
 
   before do
@@ -28,11 +28,6 @@ describe Imap::Backup::Configuration::List do
       to receive(:new).with(accounts[1]) { connection2 }
   end
 
-  subject { described_class.new }
-
-  context "#initialize" do
-  end
-
   context "#each_connection" do
     specify "calls the block with each account's connection" do
       connections = []
@@ -45,7 +40,7 @@ describe Imap::Backup::Configuration::List do
     context "with account parameter" do
       subject { described_class.new(["a2@example.com"]) }
 
-      it "should only create requested accounts" do
+      it "only creates requested accounts" do
         connections = []
 
         subject.each_connection { |a| connections << a }
@@ -58,9 +53,9 @@ describe Imap::Backup::Configuration::List do
       let(:exists) { false }
 
       it "fails" do
-        expect {
+        expect do
           subject.each_connection {}
-        }.to raise_error(Imap::Backup::ConfigurationNotFound, /not found/)
+        end.to raise_error(Imap::Backup::ConfigurationNotFound, /not found/)
       end
     end
   end

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

@@ -1,4 +1,4 @@
-require "spec_helper"
+# rubocop:disable RSpec/NestedGroups
 
 describe Imap::Backup::Configuration::Setup do
   include HighLineTestHelpers
@@ -12,39 +12,41 @@ describe Imap::Backup::Configuration::Setup do
   end
 
   context "#run" do
+    subject { described_class.new }
+
     let(:normal) { {username: "account@example.com"} }
     let(:accounts) { [normal] }
     let(:store) do
-      double(
-        "Imap::Backup::Configuration::Store",
-        :accounts => accounts,
-        :path => "/base/path",
-        :save => nil,
-        :debug? => debug,
-        :debug= => nil,
-        :modified? => modified,
+      instance_double(
+        Imap::Backup::Configuration::Store,
+        "accounts": accounts,
+        "path": "/base/path",
+        "save": nil,
+        "debug?": debug,
+        "debug=": nil,
+        "modified?": modified
       )
     end
     let(:debug) { false }
     let(:modified) { false }
+    let!(:highline_streams) { prepare_highline }
+    let(:input) { highline_streams[0] }
+    let(:output) { highline_streams[1] }
 
-    before :each do
+    before do
       allow(Imap::Backup::Configuration::Store).to receive(:new) { store }
       allow(Imap::Backup).to receive(:setup_logging)
-      @input, @output = prepare_highline
-      allow(@input).to receive(:eof?).and_return(false)
-      allow(@input).to receive(:gets).and_return("exit\n")
-      allow(subject).to receive(:system)
+      allow(input).to receive(:eof?) { false }
+      allow(input).to receive(:gets) { "exit\n" }
+      allow(Kernel).to receive(:system)
     end
 
-    subject { described_class.new }
-
     context "main menu" do
       before { subject.run }
 
       %w(add\ account save\ and\ exit exit\ without\ saving).each do |choice|
         it "includes #{choice}" do
-          expect(@output.string).to include(choice)
+          expect(output.string).to include(choice)
         end
       end
     end
@@ -52,7 +54,7 @@ describe Imap::Backup::Configuration::Setup do
     it "clears the screen" do
       subject.run
 
-      expect(subject).to have_received(:system).with("clear")
+      expect(Kernel).to have_received(:system).with("clear")
     end
 
     it "updates logging status" do
@@ -70,19 +72,19 @@ describe Imap::Backup::Configuration::Setup do
 
       context "normal accounts" do
         it "are listed" do
-          expect(@output.string).to match /account@example.com/
+          expect(output.string).to match(/account@example.com/)
         end
       end
 
       context "modified accounts" do
         it "are flagged" do
-          expect(@output.string).to match /modified@example.com \*/
+          expect(output.string).to match(/modified@example.com \*/)
         end
       end
 
       context "deleted accounts" do
         it "are hidden" do
-          expect(@output.string).to_not match /delete@example.com/
+          expect(output.string).to_not match(/delete@example.com/)
         end
       end
     end
@@ -96,10 +98,12 @@ describe Imap::Backup::Configuration::Setup do
           folders: []
         }
       end
-      let(:account) { double("Imap::Backup::Configuration::Account", run: nil) }
+      let(:account) do
+        instance_double(Imap::Backup::Configuration::Account, run: nil)
+      end
 
       before do
-        allow(@input).to receive(:gets).and_return("add\n", "exit\n")
+        allow(input).to receive(:gets).and_return("add\n", "exit\n")
         allow(Imap::Backup::Configuration::Asker).to receive(:email).
           with(no_args).and_return("new@example.com")
         allow(Imap::Backup::Configuration::Account).to receive(:new).
@@ -120,12 +124,12 @@ describe Imap::Backup::Configuration::Setup do
     context "logging" do
       context "when debug logging is disabled" do
         before do
-          allow(@input).to receive(:gets).and_return("start\n", "exit\n")
+          allow(input).to receive(:gets).and_return("start\n", "exit\n")
           subject.run
         end
 
         it "shows a menu item" do
-          expect(@output.string).to include("start logging")
+          expect(output.string).to include("start logging")
         end
 
         context "when selected" do
@@ -143,17 +147,17 @@ describe Imap::Backup::Configuration::Setup do
         let(:debug) { true }
 
         before do
-          allow(@input).to receive(:gets).and_return("stop\n", "exit\n")
+          allow(input).to receive(:gets).and_return("stop\n", "exit\n")
           subject.run
         end
 
         it "shows a menu item" do
-          expect(@output.string).to include("stop logging")
+          expect(output.string).to include("stop logging")
         end
 
         context "when selected" do
           before do
-            allow(@input).to receive(:gets).and_return("stop\n", "exit\n")
+            allow(input).to receive(:gets).and_return("stop\n", "exit\n")
           end
 
           it "unsets the debug flag" do
@@ -169,7 +173,7 @@ describe Imap::Backup::Configuration::Setup do
 
     context "when 'save' is selected" do
       before do
-        allow(@input).to receive(:gets).and_return("save\n")
+        allow(input).to receive(:gets).and_return("save\n")
         subject.run
       end
 
@@ -184,7 +188,7 @@ describe Imap::Backup::Configuration::Setup do
 
     context "when 'exit without saving' is selected" do
       before do
-        allow(@input).to receive(:gets).and_return("exit\n")
+        allow(input).to receive(:gets).and_return("exit\n")
 
         subject.run
       end
@@ -209,3 +213,5 @@ describe Imap::Backup::Configuration::Setup do
     end
   end
 end
+
+# rubocop:enable RSpec/NestedGroups

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

@@ -1,6 +1,7 @@
-require "spec_helper"
 require "json"
 
+# rubocop:disable RSpec/PredicateMatcher
+
 describe Imap::Backup::Configuration::Store do
   let(:directory) { "/base/path" }
   let(:file_path) { File.join(directory, "/config.json") }
@@ -130,8 +131,10 @@ describe Imap::Backup::Configuration::Store do
   end
 
   describe "#save" do
+    subject { described_class.new }
+
     let(:directory_exists) { false }
-    let(:file) { double("File", write: nil) }
+    let(:file) { instance_double(File, write: nil) }
 
     before do
       allow(FileUtils).to receive(:mkdir)
@@ -140,8 +143,6 @@ describe Imap::Backup::Configuration::Store do
       allow(JSON).to receive(:pretty_generate).and_return("JSON output")
     end
 
-    subject { described_class.new }
-
     it "creates the config directory" do
       subject.save
 
@@ -219,3 +220,5 @@ describe Imap::Backup::Configuration::Store do
     end
   end
 end
+
+# rubocop:enable RSpec/PredicateMatcher

data/spec/unit/imap/backup/downloader_spec.rb

@@ -1,17 +1,21 @@
-require "spec_helper"
-
 describe Imap::Backup::Downloader do
   describe "#run" do
+    subject { described_class.new(folder, serializer) }
+
     let(:message) { {"RFC822" => "blah"} }
     let(:folder) do
-      double("Imap::Backup::Account::Folder", fetch: message, name: "folder")
+      instance_double(
+        Imap::Backup::Account::Folder,
+        fetch: message,
+        name: "folder"
+      )
+    end
+    let(:folder_uids) { %w(111 222 333) }
+    let(:serializer) do
+      instance_double(Imap::Backup::Serializer::Mbox, save: nil)
     end
-    let(:folder_uids) { ["111", "222", "333"] }
-    let(:serializer) { double("Imap::Backup::Serializer", save: nil) }
     let(:serializer_uids) { ["222"] }
 
-    subject { described_class.new(folder, serializer) }
-
     before do
       allow(folder).to receive(:uids).and_return(folder_uids)
       allow(serializer).to receive(:uids).and_return(serializer_uids)