motion-kit 0.11.1 → 0.11.2

data/spec/ios/constraints_helpers/size_constraints_spec.rb

@@ -3,13 +3,14 @@ describe 'Constraints - Size helpers' do
   before do
     @layout = MK::Layout.new
     @constraint = nil
-    @superview = nil
-    @view = nil
+    @view = UIView.new
+    @parent_view = UIView.new
+    @parent_view.addSubview(@view)
     @another_view = nil
   end
 
   it 'should support `size 10`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size(10)
       end
@@ -317,7 +318,7 @@ describe 'Constraints - Size helpers' do
     @constraint.attribute2.should == [:width, :height]
   end
   it 'should support `max_size("50%")`' do
-    @superview = @layout.context(UIView.new) do
+    @layout.context(@parent_view) do
       @view = @layout.add(UIView.new) do
         @layout.constraints do
           @constraint = @layout.max_size('50%')
@@ -333,7 +334,7 @@ describe 'Constraints - Size helpers' do
     @constraint.attribute2.should == [:width, :height]
   end
   it 'should support `max_size("50% + 1").of(:another_view)`' do
-    @superview = @layout.context(UIView.new) do
+    @layout.context(@parent_view) do
       @view = @layout.add(UIView.new) do
         @layout.constraints do
           @constraint = @layout.max_size('50% + 1').of(:another_view)

data/spec/ios/constraints_helpers/view_lookup_constraints_spec.rb

@@ -3,13 +3,15 @@ describe 'Constraints - view_lookup method' do
   before do
     @layout = MK::Layout.new
     @constraint = nil
-    @view = nil
+    @view = UIView.new
+    @parent_view = UIView.new
+    @parent_view.addSubview(@view)
     @another_view = nil
   end
 
   it 'should support :superview' do
-    @superview = @layout.context(UIView.new) do
-      @view = @layout.add(UIView.new) do
+    @layout.context(@parent_view) do
+      @layout.context(@view) do
         @layout.constraints do
           @constraint = @layout.left.equals(:superview).plus(10)
         end
@@ -28,15 +30,15 @@ describe 'Constraints - view_lookup method' do
     resolved[0].firstItem.should.be.kind_of(UIView)
     resolved[0].firstAttribute.should == NSLayoutAttributeLeft
     resolved[0].relation.should == NSLayoutRelationEqual
-    resolved[0].secondItem.should == @superview
+    resolved[0].secondItem.should == @parent_view
     resolved[0].secondAttribute.should == NSLayoutAttributeLeft
     resolved[0].multiplier.should == 1
     resolved[0].constant.should == 10
   end
 
   it 'should support :another_view' do
-    @superview = @layout.context(UIView.new) do
-      @view = @layout.add(UIView.new) do
+    @layout.context(@parent_view) do
+      @layout.context(@view) do
         @layout.constraints do
           @constraint = @layout.left.equals(:another_view).plus(10)
         end
@@ -63,9 +65,9 @@ describe 'Constraints - view_lookup method' do
   end
 
   it 'should support @another_view' do
-    @superview = @layout.context(UIView.new) do
+    @layout.context(@parent_view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
-      @view = @layout.add(UIView.new) do
+      @layout.context(@view) do
         @layout.constraints do
           @constraint = @layout.left.equals(@another_view).plus(10)
         end

data/spec/ios/relative_layout.spec.rb

@@ -13,7 +13,7 @@ describe 'Relative Layouts' do
       @subject.get(:test).frame.origin.y.should == 0
     end
     it "with frame w = h = 100" do
-      @subject.get(:test).frame.size.width.should == 320 # how do I best set this to 100% of the screen, in case future simulators have higher resolution?
+      @subject.get(:test).frame.size.width.should == UIScreen.mainScreen.bounds.size.width
       @subject.get(:test).frame.size.height.should == 100
     end
   end
@@ -24,7 +24,7 @@ describe 'Relative Layouts' do
       @subject.get(:test2).frame.origin.y.should == 100
     end
     it "with frame w = 100, h = 50" do
-      @subject.get(:test2).frame.size.width.should == 320 # how do I best set this to 100% of the screen, in case future simulators have higher resolution?
+      @subject.get(:test2).frame.size.width.should == UIScreen.mainScreen.bounds.size.width
       @subject.get(:test2).frame.size.height.should == 50
     end
   end

data/spec/osx/constraints_helpers/size_constraints_spec.rb

@@ -1,18 +1,21 @@
-describe 'Size constraints helpers' do
+describe 'Constraints - Size helpers' do
 
   before do
     @layout = MK::Layout.new
     @constraint = nil
-    @view = nil
+    @view = NSView.new
+    @parent_view = NSView.new
+    @parent_view.addSubview(@view)
     @another_view = nil
   end
 
   it 'should support `size 10`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [1, 1]
@@ -20,12 +23,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `min_size 10`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.min_size(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :gte
     @constraint.multiplier.should == [1, 1]
@@ -33,12 +38,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `max_size 10`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.max_size(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :lte
     @constraint.multiplier.should == [1, 1]
@@ -46,12 +53,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `size [10, 10]`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size([10, 10])
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [1, 1]
@@ -59,12 +68,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `min_size [10, 10]`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.min_size([10, 10])
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :gte
     @constraint.multiplier.should == [1, 1]
@@ -72,12 +83,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `max_size [10, 10]`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.max_size([10, 10])
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :lte
     @constraint.multiplier.should == [1, 1]
@@ -85,12 +98,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `size w: 10, h: 10`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size(w: 10, h: 10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [1, 1]
@@ -98,12 +113,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `min_size w: 10, h: 10`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.min_size(w: 10, h: 10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :gte
     @constraint.multiplier.should == [1, 1]
@@ -111,12 +128,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `max_size w: 10, h: 10`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.max_size(w: 10, h: 10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :lte
     @constraint.multiplier.should == [1, 1]
@@ -124,12 +143,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `size.equals(:another_view[, :size])`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size.equals(:another_view)
       end
     end
+
     @constraint.constant.should == [0, 0]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [1, 1]
@@ -137,12 +158,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `size.equals(:another_view).plus(10).plus([5, 10])`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size.equals(:another_view).plus(10).plus([5, 10])
       end
     end
+
     @constraint.constant.should == [15, 20]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [1, 1]
@@ -150,12 +173,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `min_size.equals(:another_view[, :size])`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.min_size.equals(:another_view)
       end
     end
+
     @constraint.constant.should == [0, 0]
     @constraint.relationship.should == :gte
     @constraint.multiplier.should == [1, 1]
@@ -163,12 +188,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `max_size.equals(:another_view[, :size])`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.max_size.equals(:another_view)
       end
     end
+
     @constraint.constant.should == [0, 0]
     @constraint.relationship.should == :lte
     @constraint.multiplier.should == [1, 1]
@@ -176,12 +203,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `size.equals(:another_view).plus(10)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size.equals(:another_view).plus(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [1, 1]
@@ -189,12 +218,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `min_size.equals(:another_view).plus(10)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.min_size.equals(:another_view).plus(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :gte
     @constraint.multiplier.should == [1, 1]
@@ -202,12 +233,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `max_size.equals(:another_view).plus(10)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.max_size.equals(:another_view).plus(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :lte
     @constraint.multiplier.should == [1, 1]
@@ -215,12 +248,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `size.equals(:another_view).plus([10, 10])`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size.equals(:another_view).plus([10, 10])
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [1, 1]
@@ -228,12 +263,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `min_size.equals(:another_view).plus([10, 10])`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.min_size.equals(:another_view).plus([10, 10])
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :gte
     @constraint.multiplier.should == [1, 1]
@@ -241,12 +278,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `max_size.equals(:another_view).plus(w: 10, h: 10)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.max_size.equals(:another_view).plus(w: 10, h: 10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :lte
     @constraint.multiplier.should == [1, 1]
@@ -254,12 +293,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `size.equals(:another_view).times(2).plus(10)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size.equals(:another_view).times(2).plus(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [2, 2]
@@ -267,12 +308,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `min_size.equals(:another_view).times(2).plus(10)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.min_size.equals(:another_view).times(2).plus(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :gte
     @constraint.multiplier.should == [2, 2]
@@ -280,12 +323,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `max_size.equals(:another_view).times(2).plus(10)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.max_size.equals(:another_view).times(2).plus(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :lte
     @constraint.multiplier.should == [2, 2]
@@ -293,12 +338,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `size.equals(:another_view).times([2, 2]).plus(10)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size.equals(:another_view).times([2, 2]).plus(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [2, 2]
@@ -306,12 +353,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `min_size.equals(:another_view).times([2, 2]).plus(10)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.min_size.equals(:another_view).times([2, 2]).plus(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :gte
     @constraint.multiplier.should == [2, 2]
@@ -319,12 +368,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `max_size.equals(:another_view).times(w: 2, h: 2).plus(10)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.max_size.equals(:another_view).times(w: 2, h: 2).plus(10)
       end
     end
+
     @constraint.constant.should == [10, 10]
     @constraint.relationship.should == :lte
     @constraint.multiplier.should == [2, 2]
@@ -332,12 +383,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `size.equals(:another_view).times(2).times([3, 4])`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size.equals(:another_view).times(2).times([3, 4])
       end
     end
+
     @constraint.constant.should == [0, 0]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [6, 8]
@@ -345,12 +398,14 @@ describe 'Size constraints helpers' do
     @constraint.attribute.should == [:width, :height]
     @constraint.attribute2.should == [:width, :height]
   end
+
   it 'should support `size.equals(:another_view).divided_by(2)`' do
-    @layout.context(NSView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.size.equals(:another_view).divided_by(2)
       end
     end
+
     @constraint.constant.should == [0, 0]
     @constraint.relationship.should == :equal
     @constraint.multiplier.should == [0.5, 0.5]