Merge pull request vendasta#7 from Yesware/nested-mailbox-bug

tjwp-yesware · tjwp-yesware · commit 8e6aac833e48 · 2013-03-26T18:35:56.000-07:00
Fix a bug in nested access to mailboxes
diff --git a/lib/gmail/client/base.rb b/lib/gmail/client/base.rb
@@ -163,7 +163,7 @@ def mailbox(name, read_only = nil, &block)
             result = block.arity == 1 ? block.call(mailbox) : block.call
             mailbox_stack.pop
             last_mailbox = mailbox_stack.last
-            switch_to_mailbox(last_mailbox, last_mailbox ? last_mailbox.read_only : nil)
+            switch_to_mailbox(last_mailbox, last_mailbox ? mailboxes[last_mailbox].read_only : nil)
             return result
           end
 
diff --git a/spec/support/mailbox_helpers.rb b/spec/support/mailbox_helpers.rb
@@ -19,4 +19,22 @@
       client.labels.delete("TEST")
     end
   end
+
+  it "should allow nested mailbox access" do
+    mock_client do |client|
+      client.labels.create("TEST")
+      client.labels.create("TEST2")
+
+      # Add a mailbox to the stack
+      client.send(:mailbox_stack) << 'TEST'
+      client.mailboxes['TEST'] = Gmail::Mailbox.new(client, 'TEST', true)
+
+      client.mailbox("TEST2") do |mailbox|
+        mailbox.name.should == "TEST2"
+      end
+
+      client.labels.delete("TEST")
+      client.labels.delete("TEST2")
+    end
+  end
 end
