File tree Expand file tree Collapse file tree 2 files changed +8
-2
lines changed Expand file tree Collapse file tree 2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ def blackberry10?
5757
5858 # Detect if current platform is Macintosh.
5959 def mac?
60- !! ( ua =~ /Mac OS X/ )
60+ ua =~ /Mac OS X/ && ! ios?
6161 end
6262
6363 # Detect if current platform is Windows.
Original file line number Diff line number Diff line change 5050 assert @browser . modern?
5151 assert @browser . ios?
5252 refute @browser . tablet?
53+ refute @browser . mac?
5354 assert_equal "3.0" , @browser . full_version
5455 assert_equal "3" , @browser . version
5556 end
7677 assert @browser . modern?
7778 assert @browser . ios?
7879 refute @browser . tablet?
80+ refute @browser . mac?
7981 assert_equal "3.0" , @browser . full_version
8082 assert_equal "3" , @browser . version
8183 end
9193 assert @browser . ios?
9294 assert @browser . tablet?
9395 refute @browser . mobile?
96+ refute @browser . mac?
9497 assert_equal "4.0.4" , @browser . full_version
9598 assert_equal "4" , @browser . version
9699 end
99102 @browser . ua = $ua[ "IOS4" ]
100103 assert @browser . ios?
101104 assert @browser . ios4?
105+ refute @browser . mac?
102106 end
103107
104108
105109 it "detects ios5" do
106110 @browser . ua = $ua[ "IOS5" ]
107111 assert @browser . ios?
108112 assert @browser . ios5?
113+ refute @browser . mac?
109114 end
110115
111116 it "detects ios6" do
112117 @browser . ua = $ua[ "IOS6" ]
113118 assert @browser . ios?
114119 assert @browser . ios6?
120+ refute @browser . mac?
115121 end
116122
117123 it "detects ios7" do
118124 @browser . ua = $ua[ "IOS7" ]
119125 assert @browser . ios?
120126 assert @browser . ios7?
127+ refute @browser . mac?
121128 end
122129
123130 it "detects ie6" do
530537 assert meta . include? ( "ios" )
531538 assert meta . include? ( "safari" )
532539 assert meta . include? ( "safari3" )
533- assert meta . include? ( "mac" )
534540 assert meta . include? ( "modern" )
535541 assert meta . include? ( "mobile" )
536542 end
You can’t perform that action at this time.
0 commit comments