So, yes, it took much longer to expel the Moors once the march to their defeat but their expulsion began in earnest in her time.
Characterization of Moorish Spain as some 'golden age' (750-1260AD) is a misnomer as well. Bill Warner, PhD: The Not So Golden Age of Islam illustrates the vile mischaracterization of peaceful Islam during this "golden age" of al Anadalus.
Neither the Jews nor the Muslims were ever completely expelled from Spain