Using jQuery#attr() now that it is working again

LearnBoost · Dec 8, 2010 · c221de0 · c221de0
1 parent 545da24
commit c221de0
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/lib/assertions/should.js b/lib/assertions/should.js
@@ -117,7 +117,7 @@ Assertion.prototype.one = function(selector, text){
 
 Assertion.prototype.attr = function(key, val){
   var elem = this.obj
-    , attr = elem.get(0).getAttribute(key);
+    , attr = elem.attr(key);
 
   if (!val || (val && !this.negate)) {
     this.assert(
@@ -146,7 +146,7 @@ Assertion.prototype.attr = function(key, val){
 
 Assertion.prototype.class = function(name){
   var elem = this.obj
-    , classes = elem.get(0).getAttribute('class').split(/ +/);
+    , classes = elem.attr('class').split(/ +/);
 
   this.assert(
       ~classes.indexOf(name)
@@ -311,7 +311,7 @@ Assertion.prototype.value = attr('value');
 
 Assertion.prototype.__defineGetter__('enabled', function(){
   var elem = this.obj
-    , disabled = elem.get(0).getAttribute('disabled');
+    , disabled = elem.attr('disabled');
 
   this.assert(
       !disabled
@@ -330,7 +330,7 @@ Assertion.prototype.__defineGetter__('enabled', function(){
 
 Assertion.prototype.__defineGetter__('disabled', function(){
   var elem = this.obj
-    , disabled = elem.get(0).getAttribute('disabled');
+    , disabled = elem.attr('disabled');
 
   this.assert(
       disabled
@@ -368,11 +368,10 @@ Assertion.prototype.__defineGetter__('selected', bool('selected'));
 
 function bool(name) {
   return function(){
-    var elem = this.obj
-      , val = elem.get(0).getAttribute(name);
+    var elem = this.obj;
 
     this.assert(
-        name == val
+        elem.attr(name)
       , 'expected ' + j(elem) + ' to be ' + name
       , 'expected ' + j(elem) + ' to not be ' + name);
 
@@ -391,7 +390,7 @@ function bool(name) {
 function attr(name) {
   return function(expected){
     var elem = this.obj
-      , val = elem.get(0).getAttribute(name);
+      , val = elem.attr(name);
 
     this.assert(
         expected == val