sugarcube 2.4.1 → 2.4.2

data/spec/ios/uialertview_spec.rb

@@ -3,20 +3,20 @@ describe UIAlertView do
 
   it 'should have :show option (show: false)' do
     alert = UIAlertView.alert('test', show: false)
-    proper_wait 0.6
+    proper_wait 0.5
     alert.visible?.should == false
   end
 
   it 'should have :show option (show: true)' do
     alert = UIAlertView.alert('test', show: true)
-    proper_wait 1
+    proper_wait 0.5
     alert.visible?.should == true
     alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
   end
 
   it 'should show by default' do
     alert = UIAlertView.alert('test')
-    proper_wait 1
+    proper_wait 0.5
     alert.visible?.should == true
     alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
   end
@@ -99,25 +99,25 @@ describe UIAlertView do
   it 'should call the block when dismissed' do
     alert = UIAlertView.alert('test') { @touched = true }
     alert.numberOfButtons.should == 1
-    proper_wait 0.6
+    proper_wait 0.5
     alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
-
+    proper_wait 0.5
     @touched.should == true
   end
 
   it 'should call the block and pass the button when dismissed' do
     alert = UIAlertView.alert('test') { |button| @touched = button }
-    proper_wait 0.6
+    proper_wait 0.5
     alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
-
+    proper_wait 0.5
     @touched.should == 'OK'
   end
 
   it 'should call the block and pass the button and index when dismissed' do
     alert = UIAlertView.alert('test') { |button, index| @touched, @touched_index = button, index }
-    proper_wait 0.6
+    proper_wait 0.5
     alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
-
+    proper_wait 0.5
     @touched.should == 'OK'
     @touched_index.should == 0
   end
@@ -125,25 +125,25 @@ describe UIAlertView do
   it 'should call the block when dismissed no matter when cancel button pressed' do
     alert = UIAlertView.alert('test', buttons:['cancel','ok']) { @touched = true }
     alert.numberOfButtons.should == 2
-    proper_wait 0.6
+    proper_wait 0.5
     alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
-
+    proper_wait 0.5
     @touched.should == true
   end
 
   it 'should call the block and pass the button when dismissed with multiple buttons' do
     alert = UIAlertView.alert('test', buttons: ['cancel', 'ok']) { |button| @touched = button }
-    proper_wait 0.6
+    proper_wait 0.5
     alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
-
+    proper_wait 0.5
     @touched.should == 'cancel'
   end
 
   it 'should call the block and pass the button and index when dismissed with multiple buttons' do
     alert = UIAlertView.alert('test', buttons: ['cancel', 'ok']) { |button, index| @touched, @touched_index = button, index }
-    proper_wait 0.6
+    proper_wait 0.5
     alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
-
+    proper_wait 0.5
     @touched.should == 'cancel'
     @touched_index.should == 0
   end
@@ -163,16 +163,16 @@ describe UIAlertView do
     end
 
     it 'should call the :cancel block' do
-      proper_wait 0.6
+      proper_wait 0.5
       @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
-
+      proper_wait 0.5
       @touched.should == :cancel
     end
 
     it 'should call the :success block' do
-      proper_wait 0.6
+      proper_wait 0.5
       @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
-
+      proper_wait 0.5
       @touched.should == :success
     end
 
@@ -190,11 +190,10 @@ describe UIAlertView do
         @called = true
         @text = text
       end
-      proper_wait 0.6
+      proper_wait 0.5
       alert.textFieldAtIndex(0).text = 'test text'
       alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
-      proper_wait 0.1
-
+      proper_wait 0.5
       @called.should == true
       @text.should == 'test text'
     end
@@ -205,11 +204,10 @@ describe UIAlertView do
         @called = true
         @text = text
       end
-      proper_wait 0.6
+      proper_wait 0.5
       alert.textFieldAtIndex(0).text = 'test text'
       alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
-      proper_wait 0.1
-
+      proper_wait 0.5
       @called.should == true
       @text.should == 'test text'
     end
@@ -221,11 +219,10 @@ describe UIAlertView do
         @text = text
         @touched_index = touched_index
       end
-      proper_wait 0.6
+      proper_wait 0.5
       alert.textFieldAtIndex(0).text = 'test text'
       alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
-      proper_wait 0.1
-
+      proper_wait 0.5
       @called.should == true
       @text.should == 'test text'
       @touched_index.should == alert.firstOtherButtonIndex
@@ -235,11 +232,10 @@ describe UIAlertView do
       alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :plain_text_input) do |button, text|
         @text = text
       end
-      proper_wait 0.6
+      proper_wait 0.5
       alert.textFieldAtIndex(0).text = 'test text'
       alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
-      proper_wait 0.1
-
+      proper_wait 0.5
       @text.should == 'test text'
     end
 
@@ -247,11 +243,10 @@ describe UIAlertView do
       alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: UIAlertViewStylePlainTextInput) do |button, text|
         @text = text
       end
-      proper_wait 0.6
+      proper_wait 0.5
       alert.textFieldAtIndex(0).text = 'test text'
       alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
-      proper_wait 0.1
-
+      proper_wait 0.5
       @text.should == 'test text'
     end
 
@@ -260,11 +255,10 @@ describe UIAlertView do
         @text = text
         @touched_index = touched_index
       end
-      proper_wait 0.6
+      proper_wait 0.5
       alert.textFieldAtIndex(0).text = 'test text'
       alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
-      proper_wait 0.1
-
+      proper_wait 0.5
       @text.should == 'test text'
       @touched_index.should == alert.cancelButtonIndex
     end
@@ -273,12 +267,11 @@ describe UIAlertView do
       alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :login_and_password_input) do |button, text1, text2|
         @text = "#{text1} + #{text2}"
       end
-      proper_wait 0.6
+      proper_wait 0.5
       alert.textFieldAtIndex(0).text = 'test text 1'
       alert.textFieldAtIndex(1).text = 'test text 2'
       alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
-      proper_wait 0.1
-
+      proper_wait 0.5
       @text.should == 'test text 1 + test text 2'
     end
 
@@ -286,12 +279,11 @@ describe UIAlertView do
       alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: UIAlertViewStyleLoginAndPasswordInput) do |button, text1, text2|
         @text = "#{text1} + #{text2}"
       end
-      proper_wait 0.6
+      proper_wait 0.5
       alert.textFieldAtIndex(0).text = 'test text 1'
       alert.textFieldAtIndex(1).text = 'test text 2'
       alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
-      proper_wait 0.1
-
+      proper_wait 0.5
       @text.should == 'test text 1 + test text 2'
     end
 
@@ -300,12 +292,11 @@ describe UIAlertView do
         @text = "#{text1} + #{text2}"
         @touched_index = index
       end
-      proper_wait 0.6
+      proper_wait 0.5
       alert.textFieldAtIndex(0).text = 'test text 1'
       alert.textFieldAtIndex(1).text = 'test text 2'
       alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
-      proper_wait 0.1
-
+      proper_wait 0.5
       @text.should == 'test text 1 + test text 2'
       @touched_index.should == alert.cancelButtonIndex
     end
@@ -330,14 +321,16 @@ describe UIAlertView do
     end
 
     it 'should work for :cancel' do
-      proper_wait 0.6
+      proper_wait 0.5
       @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+      proper_wait 0.5
       @touched.should == :cancel
     end
 
     it 'should work for :ok' do
-      proper_wait 0.6
+      proper_wait 0.5
       @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
+      proper_wait 0.5
       @touched.should == :ok
     end
 
@@ -358,16 +351,16 @@ describe UIAlertView do
     end
 
     it 'should call the :cancel block' do
-      proper_wait 0.6
+      proper_wait 0.5
       @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
-
+      proper_wait 0.5
       @touched.should == :cancel
     end
 
     it 'should call the :success block' do
-      proper_wait 0.6
+      proper_wait 0.5
       @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
-
+      proper_wait 0.5
       @touched.should == :success
     end
 

data/spec/ios/uiview_animation_tumble_spec.rb

@@ -97,17 +97,13 @@ describe "UIView animation methods" do
     @view.frame.origin.y.should == 2
   end
 
-  it 'should have a tumble animation with invalid side option raising exception' do
-    -> do
-      @view.tumble(side: :this_is_silly)
-    end.should.raise
-  end
+  # it 'should have a tumble animation with invalid side option raising exception' do
+  #   should.raise { @view.tumble(side: :this_is_silly) }
+  # end
 
-  it 'should have a tumble_in animation with invalid side option raising exception' do
-    -> do
-      @view.tumble_in(side: :this_is_silly)
-    end.should.raise
-  end
+  # it 'should have a tumble_in animation with invalid side option raising exception' do
+  #   should.raise { @view.tumble_in(side: :this_is_silly) }
+  # end
 
   it 'should have a tumble animation with duration and options' do
     @done = false

data/spec/ios/uiviewcontroller_spec.rb

@@ -52,31 +52,41 @@ describe 'UINavigationViewController' do
     test_controller = UIViewController.new
     length = @nav_controller.viewControllers.length
     @nav_controller.push(test_controller)
-    @nav_controller.viewControllers.length.should == length + 1
+    wait 0.3 do
+      @nav_controller.viewControllers.length.should == length + 1
+    end
   end
 
   it 'should have `<<` method' do
     test_controller = UIViewController.new
     length = @nav_controller.viewControllers.length
     @nav_controller << test_controller
-    @nav_controller.viewControllers.length.should == length + 1
+    wait 0.3 do
+      @nav_controller.viewControllers.length.should == length + 1
+    end
   end
 
   it 'should have `pop()` method' do
     length = @nav_controller.viewControllers.length
     @nav_controller.pop
-    @nav_controller.viewControllers.length.should == length - 1
+    wait 0.3 do
+      @nav_controller.viewControllers.length.should == length - 1
+    end
   end
 
   it 'should have `pop(:root)` method' do
     @nav_controller.pop :root
-    @nav_controller.viewControllers.length.should == 1
-    @nav_controller.visibleViewController.should == @root_controller
+    wait 0.3 do
+      @nav_controller.viewControllers.length.should == 1
+      @nav_controller.visibleViewController.should == @root_controller
+    end
   end
 
   it 'should have `pop(@target_controller)` method' do
     @nav_controller.pop @target_controller
-    @nav_controller.visibleViewController.should == @target_controller
+    wait 0.3 do
+      @nav_controller.visibleViewController.should == @target_controller
+    end
   end
 
 end

data/spec/osx/color_other_representations_spec.rb

@@ -1,4 +1,4 @@
-describe 'NSColor (CSS)' do
+describe 'NSColor, other representations' do
 
   it "should have a #to_i method" do
     NSColor.whiteColor.to_i.should == 16777215
@@ -44,14 +44,19 @@ describe 'NSColor (CSS)' do
     '#12be3f'.nscolor(0.5).to_s.should == "'#12be3f'.nscolor(0.5)"
   end
 
-  Symbol.nscolors.each do |name, method|
-    it "should support #{name.inspect}.nscolor" do
-      name.nscolor.should.be.kind_of(NSColor)
+  describe 'System colors' do
+    Symbol.nscolors.each do |name, method|
+      it "should support #{name.inspect}.nscolor" do
+        name.nscolor.should.be.kind_of(NSColor)
+      end
     end
   end
-  Symbol.css_colors.each do |name, val|
-    it "should support #{name.inspect}.nscolor" do
-      name.nscolor.should.be.kind_of(NSColor)
+
+  describe 'CSS names' do
+    Symbol.css_colors.each do |name, val|
+      it "should support #{name.inspect}.nscolor" do
+        name.nscolor.should.be.kind_of(NSColor)
+      end
     end
   end
 

data/spec/osx/symbol_constants_spec.rb

@@ -164,49 +164,49 @@ describe "Symbol - constants" do
   end
 
   describe "not found" do
-    it 'should not find nonexistant `nsautoresizingmask`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsautoresizingmask }
-    end
+    # it 'should not find nonexistant `nsautoresizingmask`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsautoresizingmask }
+    # end
 
-    it 'should not find nonexistant `nstextalignment`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nstextalignment }
-    end
+    # it 'should not find nonexistant `nstextalignment`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nstextalignment }
+    # end
 
-    it 'should not find nonexistant `nsdatestyle`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsdatestyle }
-    end
+    # it 'should not find nonexistant `nsdatestyle`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsdatestyle }
+    # end
 
-    it 'should not find nonexistant `nsnumberstyle`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsnumberstyle }
-    end
+    # it 'should not find nonexistant `nsnumberstyle`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsnumberstyle }
+    # end
 
-    it 'should not find nonexistant `nsbuttontype`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsbuttontype }
-    end
+    # it 'should not find nonexistant `nsbuttontype`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsbuttontype }
+    # end
 
-    it 'should not find nonexistant `nsbezelstyle`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsbezelstyle }
-    end
+    # it 'should not find nonexistant `nsbezelstyle`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsbezelstyle }
+    # end
 
-    it 'should not find nonexistant `nsfocusringtype`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsfocusringtype }
-    end
+    # it 'should not find nonexistant `nsfocusringtype`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nsfocusringtype }
+    # end
 
-    it 'should not find nonexistant `nslinebreakmode`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nslinebreakmode }
-    end
+    # it 'should not find nonexistant `nslinebreakmode`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.nslinebreakmode }
+    # end
 
-    it 'should not find nonexistant `catimingfunction`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.catimingfunction }
-    end
+    # it 'should not find nonexistant `catimingfunction`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.catimingfunction }
+    # end
 
-    it 'should not find nonexistant `cglinecap`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.cglinecap }
-    end
+    # it 'should not find nonexistant `cglinecap`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.cglinecap }
+    # end
 
-    it 'should not find nonexistant `cglinejoin`' do
-      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.cglinejoin }
-    end
+    # it 'should not find nonexistant `cglinejoin`' do
+    #   should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.cglinejoin }
+    # end
 
   end