Probably never given how broad the field of psychology is. The demarcation line probably runs somewhere through the field, but to separate the two sides between science and not science is an open problem. Hell, it cosmology and evolution also suffer from similar problems, but those fields are far less controversial.
Yes. As a psych major in college, I was astonished to find that the same major included, say, quantifying the changes in neurons in rat brains after rats were exposed to specific stimuli, and empirically unmoored speculation about supposed universal desires to have sex with one's mother.
