sugarcube 1.5.8 → 1.5.9

data/spec/uiactionsheet_spec.rb

@@ -1,4 +1,4 @@
-describe 'UIActionSheet' do
+describe UIActionSheet do
   tests UIViewController  # this is just needed so that a window is available
 
   before do
@@ -30,6 +30,11 @@ describe 'UIActionSheet' do
     alert.title.should == 'test title'
   end
 
+  it 'should assign the title by options' do
+    alert = UIActionSheet.alert(title: 'test title', show: false)
+    alert.title.should == 'test title'
+  end
+
   it 'should have << method' do
     alert = UIActionSheet.alert('test', show: false)
     -> {
@@ -130,6 +135,7 @@ describe 'UIActionSheet' do
 
     before do
       @touched = nil
+      @touched_index = nil
       @alert = UIActionSheet.alert('test', buttons: ['cancel', 'destructive', 'ok']) { |button, index| @touched, @touched_index = button, index }
       proper_wait 0.6
     end
@@ -158,6 +164,7 @@ describe 'UIActionSheet' do
 
     before do
       @touched = nil
+      @touched_index = nil
       @alert = UIActionSheet.alert('test', buttons: ['cancel', 'destructive']) { |button, index| @touched, @touched_index = button, index }
       proper_wait 0.6
     end
@@ -190,6 +197,7 @@ describe 'UIActionSheet' do
 
     before do
       @touched = nil
+      @touched_index = nil
       @alert = UIActionSheet.alert('test', buttons: ['cancel', nil, 'ok']) { |button, index| @touched, @touched_index = button, index }
       proper_wait 0.6
     end
@@ -222,6 +230,7 @@ describe 'UIActionSheet' do
 
     before do
       @touched = nil
+      @touched_index = nil
       @alert = UIActionSheet.alert('test', buttons: [nil, 'destructive', 'ok']) { |button, index| @touched, @touched_index = button, index }
       proper_wait 0.6
     end
@@ -254,6 +263,7 @@ describe 'UIActionSheet' do
 
     before do
       @touched = nil
+      @touched_index = nil
       @alert = UIActionSheet.alert('test', buttons: [nil, nil, 'test1', 'test2']) { |button, index| @touched, @touched_index = button, index }
       proper_wait 0.6
     end
@@ -262,7 +272,7 @@ describe 'UIActionSheet' do
       @alert.dismissWithClickedButtonIndex(-1, animated: false) if @alert.visible?
     end
 
-    it 'should call block with "cancel" when cancel button is pressed' do
+    it 'should not have cancel button' do
       @alert.cancelButtonIndex.should == -1
     end
 
@@ -285,10 +295,59 @@ describe 'UIActionSheet' do
 
   end
 
+  describe 'with :buttons defined as a hash' do
+
+    before do
+      @touched = nil
+      @touched_index = nil
+      @alert = UIActionSheet.alert('test',
+        buttons: {
+          cancel: 'Cancel',
+          destructive: 'Destructive',
+          test1: 'Test1',
+          test2: 'Test2',
+        }) { |button, index| @touched, @touched_index = button, index }
+      proper_wait 0.6
+    end
+
+    after do
+      # @alert.dismissWithClickedButtonIndex(-1, animated: false) if @alert.visible?
+    end
+
+    it 'should call block with :destructive when cancel button is pressed' do
+      @alert.destructiveButtonIndex.should == 0
+      @alert.dismissWithClickedButtonIndex(@alert.destructiveButtonIndex, animated: false)
+      @touched.should == :destructive
+      @touched_index.should == @alert.destructiveButtonIndex
+    end
+
+    it 'should call block with :cancel when cancel button is pressed' do
+      @alert.cancelButtonIndex.should == 3
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+      @touched.should == :cancel
+      @touched_index.should == @alert.cancelButtonIndex
+    end
+
+    it 'should call block with :test1 when first button is pressed' do
+      @alert.firstOtherButtonIndex.should == 1
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
+      @touched.should == :test1
+      @touched_index.should == @alert.firstOtherButtonIndex
+    end
+
+    it 'should call block with :test2 when second button is pressed' do
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex + 1, animated: false)
+      @touched.should == :test2
+      @touched_index.should == @alert.firstOtherButtonIndex + 1
+    end
+
+  end
+
   describe 'with all handlers defined' do
 
     before do
       @touched = nil
+      @touched_index = nil
       @alert = UIActionSheet.alert('test',
         buttons: ['cancel', 'destructive', 'test1', 'test2'],
         cancel: ->{ @touched = :cancel },
@@ -325,10 +384,52 @@ describe 'UIActionSheet' do
 
   end
 
+  describe 'with all handlers defined and buttons as a hash' do
+
+    before do
+      @touched = nil
+      @touched_index = nil
+      @alert = UIActionSheet.alert('test',
+        buttons: {cancel: 'cancel', destructive: 'destructive', test1: 'test1', test2: 'test2'},
+        cancel: ->{ @touched = :cancel },
+        destructive: ->{ @touched = :destructive },
+        success: ->(button, index){ @touched, @touched_index = button, index },
+        )
+      proper_wait 0.6
+    end
+
+    it 'should call block with :cancel when cancel button is pressed' do
+      @alert.cancelButtonIndex.should == 3
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+      @touched.should == :cancel
+    end
+
+    it 'should call block with :destructive when destructive button is pressed' do
+      @alert.destructiveButtonIndex.should == 0
+      @alert.dismissWithClickedButtonIndex(@alert.destructiveButtonIndex, animated: false)
+      @touched.should == :destructive
+    end
+
+    it 'should call block with "test1" when first button is pressed' do
+      @alert.firstOtherButtonIndex.should == 1
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
+      @touched.should == :test1
+      @touched_index.should == @alert.firstOtherButtonIndex
+    end
+
+    it 'should call block with "test2" when second button is pressed' do
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex + 1, animated: false)
+      @touched.should == :test2
+      @touched_index.should == @alert.firstOtherButtonIndex + 1
+    end
+
+  end
+
   describe 'with success handler defined' do
 
     before do
       @touched = nil
+      @touched_index = nil
       @alert = UIActionSheet.alert('test',
         buttons: ['cancel', 'destructive', 'test1', 'test2'],
         success: ->(button, index){ @touched, @touched_index = button, index },

data/spec/uialertview_spec.rb

@@ -1,4 +1,4 @@
-describe 'UIAlertView' do
+describe UIAlertView do
   tests UIViewController  # this is just needed so that a window is available
 
   it 'should have :show option (show: false)' do
@@ -26,12 +26,26 @@ describe 'UIAlertView' do
     alert.title.should == 'test title'
   end
 
+  it 'should assign the title by options' do
+    alert = UIAlertView.alert(title: 'test title', show: false)
+    alert.title.should == 'test title'
+  end
+
   it 'should support three args' do
     alert = UIAlertView.alert('test title', 'test message', show: false)
+    alert.title.should == 'test title'
+    alert.message.should == 'test message'
+    alert.visible?.should == false
+  end
+
+  it 'should assign the title and message by options' do
+    alert = UIAlertView.alert(title: 'test title', message: 'test message', show: false)
+    alert.title.should == 'test title'
+    alert.message.should == 'test message'
     alert.visible?.should == false
   end
 
-  describe 'should assign the message' do
+  describe 'assigning a message' do
 
     it 'should use the second arg' do
       alert = UIAlertView.alert('test title', 'test message', show: false)
@@ -134,7 +148,7 @@ describe 'UIAlertView' do
     @touched_index.should == 0
   end
 
-  describe 'Should call the appropriate block when :cancel and :success handlers are used' do
+  describe 'when :cancel and :success handlers are used' do
 
     before do
       @touched = nil
@@ -145,17 +159,17 @@ describe 'UIAlertView' do
     end
 
     after do
-      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false) if @alert.visible?
     end
 
-    it 'should work for :cancel' do
+    it 'should call the :cancel block' do
       proper_wait 0.6
       @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
 
       @touched.should == :cancel
     end
 
-    it 'should work for :success' do
+    it 'should call the :success block' do
       proper_wait 0.6
       @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
 
@@ -172,10 +186,41 @@ describe 'UIAlertView' do
 
     it 'should work with :secure_text_input' do
       @called = false
-      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :secure_text_input) { |button, text|
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :secure_text_input) do |button, text|
+        @called = true
+        @text = text
+      end
+      proper_wait 0.6
+      alert.textFieldAtIndex(0).text = 'test text'
+      alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+      proper_wait 0.1
+
+      @called.should == true
+      @text.should == 'test text'
+    end
+
+    it 'should work with UIAlertViewStyleSecureTextInput' do
+      @called = false
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: UIAlertViewStyleSecureTextInput) do |button, text|
+        @called = true
+        @text = text
+      end
+      proper_wait 0.6
+      alert.textFieldAtIndex(0).text = 'test text'
+      alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+      proper_wait 0.1
+
+      @called.should == true
+      @text.should == 'test text'
+    end
+
+    it 'should work with :secure_text_input and pass the index' do
+      @called = false
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :secure_text_input) do |button, text, touched_index|
         @called = true
         @text = text
-      }
+        @touched_index = touched_index
+      end
       proper_wait 0.6
       alert.textFieldAtIndex(0).text = 'test text'
       alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
@@ -183,12 +228,13 @@ describe 'UIAlertView' do
 
       @called.should == true
       @text.should == 'test text'
+      @touched_index.should == alert.firstOtherButtonIndex
     end
 
     it 'should work with :plain_text_input' do
-      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :plain_text_input) { |button, text|
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :plain_text_input) do |button, text|
         @text = text
-      }
+      end
       proper_wait 0.6
       alert.textFieldAtIndex(0).text = 'test text'
       alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
@@ -197,10 +243,49 @@ describe 'UIAlertView' do
       @text.should == 'test text'
     end
 
+    it 'should work with UIAlertViewStylePlainTextInput' do
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: UIAlertViewStylePlainTextInput) do |button, text|
+        @text = text
+      end
+      proper_wait 0.6
+      alert.textFieldAtIndex(0).text = 'test text'
+      alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+      proper_wait 0.1
+
+      @text.should == 'test text'
+    end
+
+    it 'should work with :plain_text_input and pass the index' do
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :plain_text_input) do |button, text, touched_index|
+        @text = text
+        @touched_index = touched_index
+      end
+      proper_wait 0.6
+      alert.textFieldAtIndex(0).text = 'test text'
+      alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+      proper_wait 0.1
+
+      @text.should == 'test text'
+      @touched_index.should == alert.cancelButtonIndex
+    end
+
     it 'should work with :login_and_password_input' do
-      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :login_and_password_input) { |button, text1, text2|
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :login_and_password_input) do |button, text1, text2|
+        @text = "#{text1} + #{text2}"
+      end
+      proper_wait 0.6
+      alert.textFieldAtIndex(0).text = 'test text 1'
+      alert.textFieldAtIndex(1).text = 'test text 2'
+      alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+      proper_wait 0.1
+
+      @text.should == 'test text 1 + test text 2'
+    end
+
+    it 'should work with UIAlertViewStyleLoginAndPasswordInput' do
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: UIAlertViewStyleLoginAndPasswordInput) do |button, text1, text2|
         @text = "#{text1} + #{text2}"
-      }
+      end
       proper_wait 0.6
       alert.textFieldAtIndex(0).text = 'test text 1'
       alert.textFieldAtIndex(1).text = 'test text 2'
@@ -211,10 +296,10 @@ describe 'UIAlertView' do
     end
 
     it 'should work with :login_and_password_input and pass the index' do
-      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :login_and_password_input) { |button, text1, text2, index|
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :login_and_password_input) do |button, text1, text2, index|
         @text = "#{text1} + #{text2}"
         @touched_index = index
-      }
+      end
       proper_wait 0.6
       alert.textFieldAtIndex(0).text = 'test text 1'
       alert.textFieldAtIndex(1).text = 'test text 2'
@@ -227,4 +312,65 @@ describe 'UIAlertView' do
 
   end
 
+  describe 'with :buttons defined as a hash' do
+
+    before do
+      @touched = nil
+      @alert = UIAlertView.alert('test',
+        buttons: {
+          cancel: 'Cancel',
+          ok: 'Ok'
+        }) do |button|
+        @touched = button
+      end
+    end
+
+    after do
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false) if @alert.visible?
+    end
+
+    it 'should work for :cancel' do
+      proper_wait 0.6
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+      @touched.should == :cancel
+    end
+
+    it 'should work for :ok' do
+      proper_wait 0.6
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
+      @touched.should == :ok
+    end
+
+  end
+
+  describe 'when :cancel and :success handlers are used and buttons as a hash' do
+
+    before do
+      @touched = nil
+      @alert = UIAlertView.alert('test', buttons: {cancel: 'cancel', ok: 'ok'},
+        cancel: ->{ @touched = :cancel },
+        success: ->{ @touched = :success }
+        )
+    end
+
+    after do
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false) if @alert.visible?
+    end
+
+    it 'should call the :cancel block' do
+      proper_wait 0.6
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+
+      @touched.should == :cancel
+    end
+
+    it 'should call the :success block' do
+      proper_wait 0.6
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
+
+      @touched.should == :success
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Colin T.A. Gray